]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge branch 'for-1111' of git://gitorious.org/smack-next/kernel into for-linus
authorJames Morris <jmorris@namei.org>
Fri, 18 Nov 2011 00:17:06 +0000 (11:17 +1100)
committerJames Morris <jmorris@namei.org>
Fri, 18 Nov 2011 00:17:06 +0000 (11:17 +1100)
commitfe8a0df46e5076429872887b467c538bc9c0c738
tree8118ba6e7d052527a14970b081934a2935283174
parent6aaf05f472c97ebceff47d9eef464574f1a55727
parent40809565ca57a8e94bae20b22da014c44ec233f6
Merge branch 'for-1111' of git://gitorious.org/smack-next/kernel into for-linus