Merge branches 'aaci', 'mmci-dma', 'pl' and 'pl011' into drivers
authorRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 17 Mar 2011 11:04:51 +0000 (11:04 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 17 Mar 2011 11:04:51 +0000 (11:04 +0000)
commit9c9585e0e96f8340d704256db00b2ec28240c36e
treee644bda53c5a1c36a4066c09601566bf20e88ad1
parent5d350cba486de34eff99d0394d8fb436af54522e
parentc8ebae37034c0ead62eb4df8ef88e999ddb8d5cf
parentba74ec7f6b2bf9e1b5d0f2c5cef08766944cb2c8
parent29772c4e28cbb33ea1f8c6dcd130ebf190b91d85
Merge branches 'aaci', 'mmci-dma', 'pl' and 'pl011' into drivers
drivers/mmc/host/mmci.c
drivers/tty/serial/amba-pl011.c
sound/arm/aaci.c