summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2012-03-26 00:57:55 +0200
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-03-26 00:57:55 +0200
commitaae528d9a8ad79d4b21b1b723abc9447fdb0d200 (patch)
tree146617a0ab9032b8ad0dfaf4afad24a8f954179f
parentARM: ecard: get rid of NO_IRQ madness (diff)
parentARM: ebsa110: provide TRICK?_SIZE macros (diff)
parentARM: 7343/1: sa11x0: convert to sparse IRQ (diff)
downloadlinux-aae528d9a8ad79d4b21b1b723abc9447fdb0d200.tar.xz
linux-aae528d9a8ad79d4b21b1b723abc9447fdb0d200.zip
Merge branches 'acorn', 'ebsa110' and 'sa11x0' into platforms