projects
/
profile
/
ivi
/
kernel-adaptation-intel-automotive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
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
author
Arnd Bergmann
<arnd@arndb.de>
Thu, 12 Jul 2012 12:44:35 +0000
(14:44 +0200)
committer
Arnd Bergmann
<arnd@arndb.de>
Thu, 12 Jul 2012 12:44:35 +0000
(14:44 +0200)
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>
Trivial merge