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)
commit1770a8988f6178efdc1bfc85fb29deacac49fe91
treeb20b8da8b92e388847a55e7c7da9d919fe3f3abb
parent1e8ff636beb6ee5c87868a6081cc4f95b1ccd713
parent734552072335b00476b626b027ca4a9f57147b6f
ARM: Merge for-2635/s5p-audio

Merge branch 'for-2635/s5p-audio' into for-linus/samsung2
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