Merge branch 'next' into for-linus
authorJames Morris <jmorris@namei.org>
Mon, 17 May 2010 22:57:00 +0000 (08:57 +1000)
committerJames Morris <jmorris@namei.org>
Mon, 17 May 2010 22:57:00 +0000 (08:57 +1000)
commit539c99fd7fc28f8db257c713c10fb4aceadf8887
treee603e48ac816cde56e4872e0f7bcdfe7bd33f3b3
parentba2e1c5f25a99dec3873745031ad23ce3fd79bff
parent4d09ec0f705cf88a12add029c058b53f288cfaa2
Merge branch 'next' into for-linus
fs/namespace.c
kernel/acct.c