]> www.infradead.org Git - linux-platform-drivers-x86.git/commitdiff
projects / linux-platform-drivers-x86.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4aa96cc fb89fcf)
Merge branch 'dma' of http://git.linaro.org/git/people/nico/linux into devel-stable
authorRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 18 Jul 2011 22:00:42 +0000 (23:00 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 18 Jul 2011 22:00:42 +0000 (23:00 +0100)
1  2 
arch/arm/kernel/setup.c patch | diff1 | diff2 | blob | history

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