]> Git Repo - linux.git/commitdiff
projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 04cf794 8ba85f8)
Merge branch 'lpc32xx/core-fixes' of git://git.antcom.de/linux-2.6 into next/soc
authorArnd Bergmann <[email protected]>
Thu, 12 Jul 2012 12:44:35 +0000 (14:44 +0200)
committerArnd Bergmann <[email protected]>
Thu, 12 Jul 2012 12:44:35 +0000 (14:44 +0200)
From Roland Stigge <[email protected]>:

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 <[email protected]>

Trivial merge
Empty description
This page took 0.052893 seconds and 4 git commands to generate.