From: Linus Torvalds Date: Thu, 27 May 2010 17:23:57 +0000 (-0700) Subject: Merge branch 'for-linus/2634-git-updates' of git://git.fluff.org/bjdooks/linux X-Git-Tag: v2.6.35-rc1~40 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=b899ebeb05da4287ce845976727e3e83dadd25d5 Merge branch 'for-linus/2634-git-updates' of git://git.fluff.org/bjdooks/linux * 'for-linus/2634-git-updates' of git://git.fluff.org/bjdooks/linux: ARM: S5PC100: Fixup cross tree merge problems ARM: S5P: Fix the platform external interrupt issues. ARM: s5pv210_defconfig: Update s5pv210_defconfig to v2.6.34-git ARM: s5pc110_defconfig: Update s5pc110_defconfig to v2.6.34-git ARM: s5pc100_defconfig: Update s5pc100_defconfig to v2.6.34-git ARM: s5p6442_defconfig: Update s5p6442_defconfig to v2.6.34-git ARM: s5p6440_defconfig: Update s5p6440_defconfig to v2.6.34-git ARM: s3c6400_defconfig: Update s3c6400_defconfig to v2.6.34-git ARM: s3c2410_defconfig: Update s3c2410_defconfig to v2.6.34-git --- b899ebeb05da4287ce845976727e3e83dadd25d5