Manual merge with Linus (conflict in drivers/input/misc/wistron_bnts.c)
[linux-2.6] / drivers / acorn /
drwxr-xr-x   ..
-rw-r--r-- 49 README
drwxr-xr-x - block
drwxr-xr-x - char