projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 95959e6 566b60c)
Merge branch 'devel-stable' into for-next
authorRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 3 Apr 2014 23:33:49 +0000 (00:33 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 3 Apr 2014 23:33:49 +0000 (00:33 +0100)
1  2 
arch/arm/Kconfig patch | diff1 | diff2 | blob | history
arch/arm/mm/dma-mapping.c patch | diff1 | diff2 | blob | history

diff --cc arch/arm/Kconfig
Simple merge
diff --cc arch/arm/mm/dma-mapping.c
Simple merge
Linux Kernel tree with some unpolished code for Colibri/Apalis modules