From: Linus Torvalds Date: Thu, 17 Dec 2009 23:58:07 +0000 (-0800) Subject: Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight X-Git-Tag: v5.15~31073 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=4e46aa083853a84c770e00b03746bdeaf5c5aeff;p=mirror_ubuntu-kernels.git Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight * 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight: backlight: mbp_nvidia_bl - add two more MacBookPro variants backlight: Pass device through notify callback in the pwm driver backlight: PTR_ERR return of wrong pointer in cr_backlight_probe() backlight: Constify struct backlight_ops backlight/thinkpad-acpi: issue backlight class events Fix up trivial conflicts in thinkpad-acpi support (backlight support already merged earlier). --- 4e46aa083853a84c770e00b03746bdeaf5c5aeff