git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
318007e
d870ea1
)
Merge branches 'imx/pata' and 'imx/sata' into next/driver
author
Arnd Bergmann
<arnd@arndb.de>
Thu, 20 Oct 2011 13:17:34 +0000
(15:17 +0200)
committer
Arnd Bergmann
<arnd@arndb.de>
Thu, 20 Oct 2011 13:17:34 +0000
(15:17 +0200)
Conflicts:
arch/arm/mach-mx5/clock-mx51-mx53.c
arch/arm/mach-mx5/devices-imx53.h
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff