Merge branch 'for-linus/2634-git-updates' of git://git.fluff.org/bjdooks/linux
commitb899ebeb05da4287ce845976727e3e83dadd25d5
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 27 May 2010 17:23:57 +0000 (27 10:23 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 27 May 2010 17:23:57 +0000 (27 10:23 -0700)
tree4eea9d850f0a2704799e226a89971f08d6454e26
parent55ddf14b04bfe5afaab892a8fb12164b803f1dd5
parentb7a5b7acb796e5c950a58a35aee559b284de6e59
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