]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge branch 'autofs-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/deller...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 13 Feb 2013 00:20:07 +0000 (16:20 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 13 Feb 2013 00:20:07 +0000 (16:20 -0800)
commitecf223fc0d4070aa7f1dbf17390d659a97dbc9a2
treea884b2c4a975badc71cc8539e1bda5c4e1a00c9c
parenta0e5056e3b733ecb7d3089f8e1e6529525490ab9
parent4f4ffc3a5398ef9bdbb32db04756d7d34e356fcf
Merge branch 'autofs-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux into akpm

Pull hp parisc automounter fix from Helge Deller:
 "This unbreaks automounter support for the parisc architecture (and
  probably aarch64 as well).""

* 'autofs-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  unbreak automounter support on 64-bit kernel with 32-bit userspace (v2)