| commit | db3c94a7edc6b29f8d52ba5884dec6a15feeadad | [log] [tgz] |
|---|---|---|
| author | Kukjin Kim <kgene.kim@samsung.com> | Tue Oct 04 20:18:36 2011 +0900 |
| committer | Kukjin Kim <kgene.kim@samsung.com> | Tue Oct 04 20:18:36 2011 +0900 |
| tree | ac9207a44cecafb9104ca4e1f46aecb9fe01383d | |
| parent | c9477f38cba225870862fd9e08868ae3d4abdfe0 [diff] | |
| parent | 568f0e278c6dd33dc11bd19c4ad781d1f8d86800 [diff] |
Merge branch 'next-samsung-devel' into next-samsung-devel-2 Conflicts: arch/arm/mach-exynos4/clock.c arch/arm/mach-s3c2412/gpio.c arch/arm/mach-s5p64x0/dma.c arch/arm/mach-s5p64x0/gpiolib.c