Linus Torvalds c397f8fa43 Merge branch 'akpm' (patches from Andrew)
Merge fifth set of updates from Andrew Morton:

 - A few things which were awaiting merges from linux-next:
     - rtc
     - ocfs2
     - misc others

 - Willy's "dax" feature: direct fs access to memory (mainly NV-DIMMs)
   which isn't backed by pageframes.

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (37 commits)
  rtc: add driver for DS1685 family of real time clocks
  MAINTAINERS: add entry for Maxim PMICs on Samsung boards
  lib/Kconfig: use bool instead of boolean
  powerpc: drop _PAGE_FILE and pte_file()-related helpers
  ocfs2: set append dio as a ro compat feature
  ocfs2: wait for orphan recovery first once append O_DIRECT write crash
  ocfs2: complete the rest request through buffer io
  ocfs2: do not fallback to buffer I/O write if appending
  ocfs2: allocate blocks in ocfs2_direct_IO_get_blocks
  ocfs2: implement ocfs2_direct_IO_write
  ocfs2: add orphan recovery types in ocfs2_recover_orphans
  ocfs2: add functions to add and remove inode in orphan dir
  ocfs2: prepare some interfaces used in append direct io
  MAINTAINERS: fix spelling mistake & remove trailing WS
  dax: does not work correctly with virtual aliasing caches
  brd: rename XIP to DAX
  ext4: add DAX functionality
  dax: add dax_zero_page_range
  ext2: get rid of most mentions of XIP in ext2
  ext2: remove ext2_aops_xip
  ...
2015-02-17 08:38:30 -08:00
..
2014-12-09 14:57:37 -08:00
2014-12-14 14:57:16 -08:00
2014-12-09 14:57:37 -08:00
2014-10-08 17:22:23 -04:00
2014-11-19 15:08:51 +01:00
2014-11-19 15:08:51 +01:00
2014-11-19 15:08:51 +01:00
2014-08-26 15:34:43 +05:30
2014-09-18 09:58:10 -07:00
2014-12-15 18:06:13 -08:00
2014-08-08 11:14:29 -07:00
2014-09-03 14:10:37 +01:00
2014-09-16 10:25:51 +08:00
2014-05-19 21:55:03 -07:00
2014-05-19 21:55:03 -07:00
2014-05-19 21:55:03 -07:00
2014-09-13 21:03:48 +00:00
2014-11-18 16:36:14 +01:00
2014-11-18 16:36:14 +01:00
2014-12-11 11:49:23 -08:00
2014-07-29 23:50:53 -07:00
2014-07-29 23:51:04 -07:00
2014-12-09 14:57:37 -08:00
2014-12-09 14:57:37 -08:00
2014-12-09 14:57:37 -08:00
2014-10-08 17:22:23 -04:00
2014-12-09 14:57:37 -08:00
2014-12-09 14:57:37 -08:00
2014-11-16 15:12:04 -08:00
2014-11-16 15:12:04 -08:00
2014-11-16 15:12:04 -08:00
2014-11-16 15:12:04 -08:00
2014-11-16 15:12:04 -08:00
2014-11-21 13:31:06 +01:00
2014-04-18 16:40:08 -07:00
2015-01-25 18:06:34 +01:00
2015-01-25 18:06:34 +01:00
2015-01-25 18:06:34 +01:00
2015-01-25 18:06:34 +01:00
2014-11-23 16:53:01 +01:00
2015-01-25 18:06:34 +01:00
2015-01-25 18:06:34 +01:00
2015-01-25 18:06:34 +01:00
2014-05-06 10:19:49 -07:00
2014-12-09 14:57:37 -08:00
2014-04-23 15:24:06 -04:00
2014-04-23 15:24:06 -04:00
2014-04-23 15:24:06 -04:00