git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
96886c4
e8a7e48
)
Merge commit 'v2.6.37-rc4' into imx-for-2.6.38
author
Sascha Hauer
<s.hauer@pengutronix.de>
Mon, 6 Dec 2010 08:36:17 +0000
(09:36 +0100)
committer
Sascha Hauer
<s.hauer@pengutronix.de>
Mon, 6 Dec 2010 08:36:17 +0000
(09:36 +0100)
Done to resolve merge conflict:
Conflicts:
arch/arm/mach-mx25/devices-imx25.h
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff