git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
4c4cbce
05d900c
)
Merge branch 'imx/cleanup' into imx/devel
author
Arnd Bergmann
<arnd@arndb.de>
Fri, 7 Oct 2011 19:57:31 +0000
(21:57 +0200)
committer
Arnd Bergmann
<arnd@arndb.de>
Fri, 7 Oct 2011 19:57:31 +0000
(21:57 +0200)
This helps resolve the conflicts between the imx cleanups and the
new code that has gone into the imx tree.
Conflict resolution was originally done by Sascha Hauer.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff