Merge by hand (conflicts in sr.c)
[linux-2.6] / drivers / video / backlight /
2005-04-16  Pavel Machek[PATCH] fix u32 vs. pm_message_t in driver/video
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2