git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
3a3b7ce
58e20d8
)
Merge branch 'master' into next
author
James Morris
<jmorris@namei.org>
Fri, 14 Nov 2008 00:29:12 +0000
(11:29 +1100)
committer
James Morris
<jmorris@namei.org>
Fri, 14 Nov 2008 00:29:12 +0000
(11:29 +1100)
Conflicts:
security/keys/internal.h
security/keys/process_keys.c
security/keys/request_key.c
Fixed conflicts above by using the non 'tsk' versions.
Signed-off-by: James Morris <jmorris@namei.org>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff