Manual merge with Linus (conflict in drivers/input/misc/wistron_bnts.c)
[linux-2.6] / drivers / misc /
drwxr-xr-x   ..
-rw-r--r-- 1061 Kconfig
-rw-r--r-- 203 Makefile
drwxr-xr-x - hdpuftrs
drwxr-xr-x - ibmasm