From: Linus Torvalds Date: Wed, 13 Feb 2013 00:20:07 +0000 (-0800) Subject: Merge branch 'autofs-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/deller... X-Git-Tag: firefly_0821_release~3680^2~1141 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ecf223fc0d4070aa7f1dbf17390d659a97dbc9a2;p=firefly-linux-kernel-4.4.55.git Merge branch 'autofs-fix' of git://git./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) --- ecf223fc0d4070aa7f1dbf17390d659a97dbc9a2