]> www.infradead.org Git - users/hch/dma-mapping.git/commitdiff
projects / users / hch / dma-mapping.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2f7989e c9c6fe5)
Merge branch 'l7200' into devel
authorRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 16 Jul 2010 10:08:33 +0000 (11:08 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 16 Jul 2010 10:08:33 +0000 (11:08 +0100)
Conflicts:
arch/arm/configs/lusl7200_defconfig

1  2 
arch/arm/Kconfig patch | diff1 | diff2 | blob | history

diff --cc arch/arm/Kconfig
Simple merge
Unnamed repository; edit this file 'description' to name the repository.