projects / GitHub / exynos8895 / android_kernel_samsung_universal8895.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 31d141e c1b1404)
Merge branch 'parisc-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/deller...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 20 Oct 2013 22:20:45 +0000 (23:20 +0100)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 20 Oct 2013 22:20:45 +0000 (23:20 +0100)
commit0df651a0740c9663093265277c32f0806e8ac23e
tree7de5baee1e67f29ec1b9532095cf3e9bcde1bc01tree | snapshot (tar.gz zip)
parent31d141e3a666269a3b6fcccddb0351caf7454240commit | diff
parentc1b14041aa86800cfd9e21b280b0eaee885fa623commit | diff
Merge branch 'parisc-3.12' of git://git./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)"