git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6dbe51c
6ebd4d0
)
Merge branch 'for-next' of git://git.pengutronix.de/git/ukl/linux into devel-stable
author
Russell King
<rmk+kernel@arm.linux.org.uk>
Sat, 9 Mar 2013 15:49:32 +0000
(15:49 +0000)
committer
Russell King
<rmk+kernel@arm.linux.org.uk>
Sat, 9 Mar 2013 15:49:32 +0000
(15:49 +0000)
Conflicts:
arch/arm/include/asm/cputype.h
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff