git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
13420c6
ca06679
)
Merge branch 'cleanups/assorted' into imx-fixes-for-arnd
author
Sascha Hauer
<s.hauer@pengutronix.de>
Tue, 22 Nov 2011 10:32:39 +0000
(11:32 +0100)
committer
Sascha Hauer
<s.hauer@pengutronix.de>
Tue, 22 Nov 2011 10:32:39 +0000
(11:32 +0100)
Conflicts:
arch/arm/mach-imx/mm-imx3.c
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff