]> Pileus Git - ~andy/linux/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)
commit6d2f42cc275ba72a47ce6933b18480163ecf2740
treeb986e612edd1d44fa64874601712060970308290
parenta9518cde232960875a1f03ba00c112f56872cf60
parent5cd435b4ab881280fb0b8ce6686cfceb005d98c8
Merge branch 'dev/pwm-backlight' into for-next

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