| commit | 86f82da586098f16d92b5637808c323f5455e935 | [log] [tgz] |
|---|---|---|
| author | Kukjin Kim <kgene.kim@samsung.com> | Tue Oct 04 20:20:08 2011 +0900 |
| committer | Kukjin Kim <kgene.kim@samsung.com> | Tue Oct 04 20:20:08 2011 +0900 |
| tree | 6397eb5550172b89d383254c7e4bca87ae4a8659 | |
| parent | db3c94a7edc6b29f8d52ba5884dec6a15feeadad [diff] | |
| parent | e90a0f3c460406d6a5a698016bc525c3e6968cb6 [diff] |
Merge branch 'next-samsung-cleanup-2' into next-samsung-devel-2 Conflicts: arch/arm/plat-s5p/include/plat/pll.h