summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-s5p
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-03-17 11:04:51 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-03-17 11:04:51 +0000
commit9c9585e0e96f8340d704256db00b2ec28240c36e (patch)
treee644bda53c5a1c36a4066c09601566bf20e88ad1 /arch/arm/plat-s5p
parent5d350cba486de34eff99d0394d8fb436af54522e (diff)
parentc8ebae37034c0ead62eb4df8ef88e999ddb8d5cf (diff)
parentba74ec7f6b2bf9e1b5d0f2c5cef08766944cb2c8 (diff)
parent29772c4e28cbb33ea1f8c6dcd130ebf190b91d85 (diff)
Merge branches 'aaci', 'mmci-dma', 'pl' and 'pl011' into drivers