Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6 into merge
[linux-2.6] / drivers / platform /
drwxr-xr-x   ..
-rw-r--r-- 79 Kconfig
-rw-r--r-- 70 Makefile
drwxr-xr-x - x86