projects / GitHub / MotorolaMobilityLLC / kernel-slsi.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 04cf794 8ba85f8)
Merge branch 'lpc32xx/core-fixes' of git://git.antcom.de/linux-2.6 into next/soc
authorArnd Bergmann <arnd@arndb.de>
Thu, 12 Jul 2012 12:44:35 +0000 (14:44 +0200)
committerArnd Bergmann <arnd@arndb.de>
Thu, 12 Jul 2012 12:44:35 +0000 (14:44 +0200)
commit478e1a141c6c5d6c060ff0af9dfcf88aa6f59ac3
tree98ea95ded39a957838910c6cdf9859429fec4064tree | snapshot (tar.gz zip)
parent04cf794165786a8e850c7f1e755a222148b0e377commit | diff
parent8ba85f8bffdfbac98dac8630406f7d020103db70commit | diff
Merge branch 'lpc32xx/core-fixes' of git://git.antcom.de/linux-2.6 into next/soc

From Roland Stigge <stigge@antcom.de>:

This is the pull request including the fix for the compile error caused
by lpc32xx-next and dma branches collisions in linux-next.

* 'lpc32xx/core-fixes' of git://git.antcom.de/linux-2.6:
  ARM: LPC32xx: Adjust to pl08x DMA interface changes

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Motorola kernel-slsi