git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7a627e3
61c4f2c
)
Merge commit 'v2.6.39' into 20110526
author
Eric Paris
<eparis@redhat.com>
Thu, 26 May 2011 21:20:14 +0000
(17:20 -0400)
committer
Eric Paris
<eparis@redhat.com>
Thu, 26 May 2011 21:20:14 +0000
(17:20 -0400)
Conflicts:
lib/flex_array.c
security/selinux/avc.c
security/selinux/hooks.c
security/selinux/ss/policydb.c
security/smack/smack_lsm.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff