Merge branch 'autofs' (patches from Ian Kent)
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 14 Dec 2012 03:13:37 +0000 (19:13 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 14 Dec 2012 03:13:37 +0000 (19:13 -0800)
commit15de0599277f3477ddd11766282587f12d214252
tree0600cf1159265f49618ff91f7b92721ada4a7628
parente05a1c6397a73d09389e033b6b2c25c954d2177c
parent0259cb02c4004d3088b0999799f8f5c8801f6b97
Merge branch 'autofs' (patches from Ian Kent)

Merge emailed autofs cleanup/fix patches from Ian Kent

* autofs:
  autofs4 - use simple_empty() for empty directory check
  autofs4 - dont clear DCACHE_NEED_AUTOMOUNT on rootless mount