Manual merge with Linus (conflict in drivers/input/misc/wistron_bnts.c)
[linux-2.6] / drivers / sh / superhyway /
drwxr-xr-x   ..
-rw-r--r-- 133 Makefile
-rw-r--r-- 1340 superhyway-sysfs.c
-rw-r--r-- 6155 superhyway.c