Merge branch 'master' into next
authorJames Morris <jmorris@namei.org>
Sun, 28 Nov 2010 21:27:07 +0000 (08:27 +1100)
committerJames Morris <jmorris@namei.org>
Sun, 28 Nov 2010 21:27:07 +0000 (08:27 +1100)
commit1d6d75684d869406e5bb2ac5d3ed9454f52d0cab
treeafb229254bed6415407b7b7d4641f9f792109966
parent074e61ec3751da9ab88ee66d3818574556c03489
parent0f639a3c5ca63dd76ee07de9b02ebf0178ce9a17
Merge branch 'master' into next
include/linux/kernel.h