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
  ...

1 files changed, 33 insertions, 1 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 0beaaac20a83..e75c21840815 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -34,7 +34,7 @@ trivial patch so apply some common sense.
         generalized kernel feature ready for next time.
 
         PLEASE check your patch with the automated style checker
-        (scripts/checkpatch.pl) to catch trival style violations.
+        (scripts/checkpatch.pl) to catch trivial style violations.
         See Documentation/CodingStyle for guidance here.
 
         PLEASE CC: the maintainers and mailing lists that are generated
@@ -2965,6 +2965,12 @@ S:	Supported
 F:      drivers/input/touchscreen/cyttsp*
 F:      include/linux/input/cyttsp.h
 
+DALLAS/MAXIM DS1685-FAMILY REAL TIME CLOCK
+M:      Joshua Kinard <kumba@gentoo.org>
+S:      Maintained
+F:      drivers/rtc/rtc-ds1685.c
+F:      include/linux/rtc/ds1685.h
+
 DAMA SLAVE for AX.25
 M:      Joerg Reuter <jreuter@yaina.de>
 W:      http://yaina.de/jreuter/
@@ -3153,6 +3159,12 @@ L:	linux-i2c@vger.kernel.org
 S:      Maintained
 F:      drivers/i2c/busses/i2c-diolan-u2c.c
 
+DIRECT ACCESS (DAX)
+M:      Matthew Wilcox <willy@linux.intel.com>
+L:      linux-fsdevel@vger.kernel.org
+S:      Supported
+F:      fs/dax.c
+
 DIRECTORY NOTIFICATION (DNOTIFY)
 M:      Eric Paris <eparis@parisplace.org>
 S:      Maintained
@@ -6212,6 +6224,26 @@ S:	Supported
 F:      drivers/power/max14577_charger.c
 F:      drivers/power/max77693_charger.c
 
+MAXIM PMIC AND MUIC DRIVERS FOR EXYNOS BASED BOARDS
+M:      Chanwoo Choi <cw00.choi@samsung.com>
+M:      Krzysztof Kozlowski <k.kozlowski@samsung.com>
+L:      linux-kernel@vger.kernel.org
+S:      Supported
+F:      drivers/*/max14577.c
+F:      drivers/*/max77686.c
+F:      drivers/*/max77693.c
+F:      drivers/extcon/extcon-max14577.c
+F:      drivers/extcon/extcon-max77693.c
+F:      drivers/rtc/rtc-max77686.c
+F:      drivers/clk/clk-max77686.c
+F:      Documentation/devicetree/bindings/mfd/max14577.txt
+F:      Documentation/devicetree/bindings/mfd/max77686.txt
+F:      Documentation/devicetree/bindings/mfd/max77693.txt
+F:      Documentation/devicetree/bindings/clock/maxim,max77686.txt
+F:      include/linux/mfd/max14577*.h
+F:      include/linux/mfd/max77686*.h
+F:      include/linux/mfd/max77693*.h
+
 MAXIRADIO FM RADIO RECEIVER DRIVER
 M:      Hans Verkuil <hverkuil@xs4all.nl>
 L:      linux-media@vger.kernel.org