summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-u300
diff options
context:
space:
mode:
authorKukjin Kim <kgene.kim@samsung.com>2011-03-11 15:48:52 +0900
committerKukjin Kim <kgene.kim@samsung.com>2011-03-11 15:48:52 +0900
commit6d2f42cc275ba72a47ce6933b18480163ecf2740 (patch)
treeb986e612edd1d44fa64874601712060970308290 /arch/arm/mach-u300
parenta9518cde232960875a1f03ba00c112f56872cf60 (diff)
parent5cd435b4ab881280fb0b8ce6686cfceb005d98c8 (diff)
Merge branch 'dev/pwm-backlight' into for-next
Conflicts: arch/arm/mach-s3c64xx/mach-smdk6410.c
Diffstat (limited to 'arch/arm/mach-u300')
0 files changed, 0 insertions, 0 deletions