Merge by hand (conflicts in scsi_lib.c)
[linux-2.6/mini2440.git] / drivers / media / 
treee80c8f8fc55eefa1adf67cbdc97e5ea505503ee3
drwxr-xr-x   ..
-rw-r--r-- 1235 Kconfig
-rw-r--r-- 175 Makefile
drwxr-xr-x - common
drwxr-xr-x - dvb
drwxr-xr-x - radio
drwxr-xr-x - video