git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
285eba5
3a09b1b
)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
author
Paul Mundt
<lethal@linux-sh.org>
Wed, 4 Aug 2010 02:56:17 +0000
(11:56 +0900)
committer
Paul Mundt
<lethal@linux-sh.org>
Wed, 4 Aug 2010 02:56:17 +0000
(11:56 +0900)
Conflicts:
arch/arm/configs/ap4evb_defconfig
arch/arm/configs/g3evm_defconfig
arch/arm/configs/g4evm_defconfig
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff