git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
04871e9
a35b914
4c54239
)
Merge branches 'cleanups/assorted' and 'cleanups/mm-tzic' into imx-cleanup
author
Sascha Hauer
<s.hauer@pengutronix.de>
Tue, 20 Sep 2011 08:09:08 +0000
(10:09 +0200)
committer
Sascha Hauer
<s.hauer@pengutronix.de>
Tue, 20 Sep 2011 08:09:08 +0000
(10:09 +0200)
Conflicts:
arch/arm/mach-mx5/Makefile
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Trivial merge