Manual merge with Linus (conflict in drivers/input/misc/wistron_bnts.c)
[powerpc.git] / drivers / media / dvb / pluto2 /
drwxr-xr-x   ..
-rw-r--r-- 500 Kconfig
-rw-r--r-- 113 Makefile
-rw-r--r-- 19542 pluto2.c