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)
commit07f1c295de593ec0b0dca3092299c048c03374da
treead8f291e550b3315f84c07e9f543e25adcf95dc3
parent4aa96ccf9ee35cdbd0d423e87a4d551019570218
parentfb89fcfb151698776be6c900aec8161b01990e92
Merge branch 'dma' of git.linaro.org/git/people/nico/linux into devel-stable
arch/arm/kernel/setup.c