ARM: Merge for-2635/samsung-ts
authorBen Dooks <ben-linux@fluff.org>
Wed, 19 May 2010 09:05:42 +0000 (18:05 +0900)
committerBen Dooks <ben-linux@fluff.org>
Wed, 19 May 2010 09:05:42 +0000 (18:05 +0900)
commit05a690d2db5bd57d3c94293b06b69158535835df
treefb924faf327ae3d6b1f4a7cde96e007e9b32d7be
parent1770a8988f6178efdc1bfc85fb29deacac49fe91
parent4f7cdc38c000deba82479205f4c99f4c1e7c6d1f
ARM: Merge for-2635/samsung-ts

Merge branch 'for-2635/samsung-ts' into for-linus/samsung2
arch/arm/plat-samsung/Kconfig
arch/arm/plat-samsung/Makefile