Merge branch 'master' of git://gitorious.org/smack-next/kernel into next
authorJames Morris <jmorris@namei.org>
Sat, 22 Oct 2011 20:23:58 +0000 (22:23 +0200)
committerJames Morris <jmorris@namei.org>
Sat, 22 Oct 2011 20:23:58 +0000 (22:23 +0200)
commitc45ed235abf1b0b6666417e3c394f18717976acd
treee41dd99f2c217a8ce160b24d81a4aec1cccbfe02
parente0b057b406a33501a656dc8d67ea945d7bcdad61
parent0e94ae17c857b3835a2b8ea46ce44b5da4e2cc5d
Merge branch 'master' of git://gitorious.org/smack-next/kernel into next