git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e77dc34
61c4f2c
)
Merge branch 'master' into next
author
James Morris
<jmorris@namei.org>
Thu, 19 May 2011 08:51:57 +0000
(18:51 +1000)
committer
James Morris
<jmorris@namei.org>
Thu, 19 May 2011 08:51:57 +0000
(18:51 +1000)
Conflicts:
include/linux/capability.h
Manually resolve merge conflict w/ thanks to Stephen Rothwell.
Signed-off-by: James Morris <jmorris@namei.org>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff