Manual merge with Linus (conflict in drivers/input/misc/wistron_bnts.c)
[linux-2.6] / drivers / rapidio / switches /
drwxr-xr-x   ..
-rw-r--r-- 67 Makefile
-rw-r--r-- 1939 tsi500.c