git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
1d568ab
817b54a
)
Merge branch 'next-evm' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/ima...
author
James Morris
<jmorris@namei.org>
Tue, 9 Aug 2011 00:31:03 +0000
(10:31 +1000)
committer
James Morris
<jmorris@namei.org>
Tue, 9 Aug 2011 00:31:03 +0000
(10:31 +1000)
Conflicts:
fs/attr.c
Resolve conflict manually.
Signed-off-by: James Morris <jmorris@namei.org>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff