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


Trivial merge