Manual merge with Linus (conflict in drivers/input/misc/wistron_bnts.c)
[linux-2.6] / drivers / sn /
drwxr-xr-x   ..
-rw-r--r-- 508 Kconfig
-rw-r--r-- 81 Makefile
-rw-r--r-- 12561 ioc4.c