git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6bf45a1
f7dd361
c070c20
d0fb0c4
)
Merge branches 'rmobile/mmcif', 'rmobile/ag5' and 'rmobile/mackerel' into rmobile...
author
Paul Mundt
<lethal@linux-sh.org>
Wed, 5 Jan 2011 08:25:29 +0000
(17:25 +0900)
committer
Paul Mundt
<lethal@linux-sh.org>
Wed, 5 Jan 2011 08:25:29 +0000
(17:25 +0900)
Conflicts:
arch/arm/mach-shmobile/Kconfig
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff