ARM: Merge for-2635/s5p-audio
authorBen Dooks <ben-linux@fluff.org>
Wed, 19 May 2010 09:05:33 +0000 (18:05 +0900)
committerBen Dooks <ben-linux@fluff.org>
Wed, 19 May 2010 09:05:33 +0000 (18:05 +0900)
Merge branch 'for-2635/s5p-audio' into for-linus/samsung2

1  2 
arch/arm/mach-s5p6440/Makefile
arch/arm/mach-s5p6440/include/mach/map.h
arch/arm/mach-s5p6442/Makefile
arch/arm/mach-s5p6442/include/mach/map.h
arch/arm/mach-s5pv210/Makefile
arch/arm/mach-s5pv210/include/mach/map.h

Simple merge
Simple merge
Simple merge