Manual merge with Linus (conflict in drivers/input/misc/wistron_bnts.c)
[powerpc.git] / arch / sh / drivers /
drwxr-xr-x   ..
-rw-r--r-- 160 Makefile
drwxr-xr-x - dma
drwxr-xr-x - pci
drwxr-xr-x - superhyway