projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e05a1c6 0259cb0)
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)
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


Trivial merge
John Crispins staging tree