git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d03a5d8
0c21e3a
)
Merge branch 'master' into next
author
James Morris
<jmorris@namei.org>
Sun, 9 Jan 2011 22:46:24 +0000
(09:46 +1100)
committer
James Morris
<jmorris@namei.org>
Sun, 9 Jan 2011 22:46:24 +0000
(09:46 +1100)
Conflicts:
security/smack/smack_lsm.c
Verified and added fix by Stephen Rothwell <sfr@canb.auug.org.au>
Ok'd by Casey Schaufler <casey@schaufler-ca.com>
Signed-off-by: James Morris <jmorris@namei.org>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff