git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ffc505c
a0f5e36
)
Merge branch 'imx/pinctrl' into imx/dt
author
Arnd Bergmann
<arnd@arndb.de>
Mon, 14 May 2012 13:23:13 +0000
(15:23 +0200)
committer
Arnd Bergmann
<arnd@arndb.de>
Mon, 14 May 2012 13:23:13 +0000
(15:23 +0200)
Conflicts:
drivers/mmc/host/sdhci-esdhc-imx.c
drivers/net/ethernet/freescale/fec.c
drivers/spi/spi-imx.c
drivers/tty/serial/imx.c
This resolves some simply but annoying conflicts.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff