commit 0df651a0740c9663093265277c32f0806e8ac23e
author Linus Torvalds <torvalds@linux-foundation.org> Sun Oct 20 23:20:45 2013 +0100
committer Linus Torvalds <torvalds@linux-foundation.org> Sun Oct 20 23:20:45 2013 +0100
tree 7de5baee1e67f29ec1b9532095cf3e9bcde1bc01
parent 31d141e3a666269a3b6fcccddb0351caf7454240
parent c1b14041aa86800cfd9e21b280b0eaee885fa623

Merge branch 'parisc-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux

Pull parsic fixes from Helge Deller:
 "There are just two small fixes in here:
   - Revert a commit which exported the flush_cache_page function.  This
     was noticed by Christoph Hellwig.
   - Enable the DEVTMPFS, DEVTMPFS_MOUNT and BLK_DEV_INITRD config
     options in the parisc defconfigs so that latest udev/initrd finds
     the root disk at boot"

* 'parisc-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc: enable DEVTMPFS, DEVTMPFS_MOUNT and BLK_DEV_INITRD in defconfigs
  Revert "parisc: Export flush_cache_page() (needed by lustre)"