projects / profile / common / kernel-common.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1770a89 4f7cdc3)
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)
Merge branch 'for-2635/samsung-ts' into for-linus/samsung2

1  2 
arch/arm/plat-samsung/Kconfig patch | diff1 | diff2 | blob | history
arch/arm/plat-samsung/Makefile patch | diff1 | diff2 | blob | history

diff --cc arch/arm/plat-samsung/Kconfig
Simple merge
diff --cc arch/arm/plat-samsung/Makefile
Simple merge
Domain: SCM / Uncategorized;