summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2012-03-25 23:57:55 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-03-25 23:57:55 +0100
commitaae528d9a8ad79d4b21b1b723abc9447fdb0d200 (patch)
tree146617a0ab9032b8ad0dfaf4afad24a8f954179f
parent41569e370c5e1f5714a3386a3795efff99891f97 (diff)
parent5eca8f3a8048235d7fa3faa9ee4fc292d25a7425 (diff)
parent375dec92777c96015a13a23eaeb4f23281fb8662 (diff)
downloadlinux-aae528d9a8ad79d4b21b1b723abc9447fdb0d200.tar.bz2
Merge branches 'acorn', 'ebsa110' and 'sa11x0' into platforms