]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'dev/pwm-backlight' into for-next
authorKukjin Kim <kgene.kim@samsung.com>
Fri, 11 Mar 2011 06:48:52 +0000 (15:48 +0900)
committerKukjin Kim <kgene.kim@samsung.com>
Fri, 11 Mar 2011 06:48:52 +0000 (15:48 +0900)
commitc6af4fa8a658a3c96c6246c53da682f49d5a3816
treeb986e612edd1d44fa64874601712060970308290
parent063ce66d88e5cc52f1d743ab26bac511afe53611
parent3375a4563c6798084d30bb70e4b8644838320555
Merge branch 'dev/pwm-backlight' into for-next

Conflicts:
arch/arm/mach-s3c64xx/mach-smdk6410.c
arch/arm/mach-s3c64xx/mach-smdk6410.c