diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-03-26 00:57:55 +0200 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-03-26 00:57:55 +0200 |
commit | aae528d9a8ad79d4b21b1b723abc9447fdb0d200 (patch) | |
tree | 146617a0ab9032b8ad0dfaf4afad24a8f954179f /drivers/input/serio | |
parent | ARM: ecard: get rid of NO_IRQ madness (diff) | |
parent | ARM: ebsa110: provide TRICK?_SIZE macros (diff) | |
parent | ARM: 7343/1: sa11x0: convert to sparse IRQ (diff) | |
download | linux-aae528d9a8ad79d4b21b1b723abc9447fdb0d200.tar.xz linux-aae528d9a8ad79d4b21b1b723abc9447fdb0d200.zip |
Merge branches 'acorn', 'ebsa110' and 'sa11x0' into platforms