projects
/
linux-flexiantxendom0.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6aaf05f
4080956
)
Merge branch 'for-1111' of git://gitorious.org/smack-next/kernel into for-linus
author
James Morris <jmorris@namei.org>
Fri, 18 Nov 2011 00:17:06 +0000
(11:17 +1100)
committer
James Morris <jmorris@namei.org>
Fri, 18 Nov 2011 00:17:06 +0000
(11:17 +1100)
Trivial merge