Manual merge with Linus (conflict in drivers/input/misc/wistron_bnts.c)
[linux-2.6] / drivers / misc / hdpuftrs /
drwxr-xr-x   ..
-rw-r--r-- 60 Makefile
-rw-r--r-- 5075 hdpu_cpustate.c
-rw-r--r-- 2765 hdpu_nexus.c