From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 13 Jan 2011 18:40:00 +0000 (-0800)
Subject: Merge branch 'rmobile-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal... 
X-Git-Tag: v2.6.38-rc1~233
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=d20056032e20061db6583f517a4d3ea4492a94f1;p=~emulex%2Finfiniband.git

Merge branch 'rmobile-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

* 'rmobile-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
  ARM: mach-shmobile: Kill off unused !gpio_is_valid() case
  ARM: mach-shmobile: sh7372 Enable SDIO IRQs for Mackerel
  ARM: mach-shmobile: sh7377 Enable SDIO IRQs
  ARM: mach-shmobile: sh7367 Enable SDIO IRQs
  ARM: mach-shmobile: sh7372 Enable SDIO IRQs
  ARM: mach-shmobile: mackerel: Add touchscreen ST1232 support
  ARM: mach-shmobile: ap4eb: SCIF port for earlyprintk when using zboot
  ARM: mach-shmobile: mackerel: SCIF port for earlyprintk when using zboot
  ARM: mach-shmobile: mackerel: Add support get_cd in CN23
---

d20056032e20061db6583f517a4d3ea4492a94f1