Merge branches 'mmci' and 'pl011-dma' into devel
authorRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 5 Jan 2011 18:08:31 +0000 (18:08 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 5 Jan 2011 18:08:31 +0000 (18:08 +0000)
commitaa312be1987d43216e72ffce42bccf6bf81f62ed
treeb994c25fc1492d7ff70d2ca83c64106b4883a808
parent31edf274f9aff1ccd39934a0b2fce38f4405c656
parent8c11a94d86eb5489dc665bc566bf624e329d89fa
parent38d624361b2a82d6317c379aebf81b1b28210bb0
Merge branches 'mmci' and 'pl011-dma' into devel