From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 20 Oct 2013 22:20:45 +0000 (+0100)
Subject: Merge branch 'parisc-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/deller... 
X-Git-Tag: next-20131021~120
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=0df651a0740c9663093265277c32f0806e8ac23e;p=karo-tx-linux.git

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)"
---

0df651a0740c9663093265277c32f0806e8ac23e