git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
0990b1c
65795ef
)
Merge branch 'linus' into perfcounters/core
author
Ingo Molnar
<mingo@elte.hu>
Wed, 17 Jun 2009 11:06:17 +0000
(13:06 +0200)
committer
Ingo Molnar
<mingo@elte.hu>
Wed, 17 Jun 2009 11:06:17 +0000
(13:06 +0200)
Conflicts:
arch/x86/include/asm/kmap_types.h
include/linux/mm.h
include/asm-generic/kmap_types.h
Merge reason: We crossed changes with kmap_types.h cleanups in mainline.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff