Manual merge with Linus (conflict in drivers/input/misc/wistron_bnts.c)
[linux-2.6] / drivers / acorn / README
1 Drivers for the ACORN "podule" ARM specific bus.