| commit | 6d2f42cc275ba72a47ce6933b18480163ecf2740 | [log] [tgz] |
|---|---|---|
| author | Kukjin Kim <kgene.kim@samsung.com> | Fri Mar 11 15:48:52 2011 +0900 |
| committer | Kukjin Kim <kgene.kim@samsung.com> | Fri Mar 11 15:48:52 2011 +0900 |
| tree | b986e612edd1d44fa64874601712060970308290 | |
| parent | a9518cde232960875a1f03ba00c112f56872cf60 [diff] | |
| parent | 5cd435b4ab881280fb0b8ce6686cfceb005d98c8 [diff] |
Merge branch 'dev/pwm-backlight' into for-next Conflicts: arch/arm/mach-s3c64xx/mach-smdk6410.c