merge by hand (qla_os.c mismerge)
[safe/jmp/linux-2.6] / drivers / video / backlight /
drwxr-xr-x   ..
-rw-r--r-- 1522 Kconfig
-rw-r--r-- 167 Makefile
-rw-r--r-- 7072 backlight.c
-rw-r--r-- 4646 corgi_bl.c
-rw-r--r-- 6682 lcd.c