From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 14 Nov 2011 08:47:04 +0000 (-0200)
Subject: Merge branch 'rmobile-fixes-for-linus' of git://github.com/pmundt/linux-sh
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=7f80850d3f9fd8fda23a317044aef3a6bafab06b;p=~shefty%2Frdma-dev.git

Merge branch 'rmobile-fixes-for-linus' of git://github.com/pmundt/linux-sh

* 'rmobile-fixes-for-linus' of git://github.com/pmundt/linux-sh:
  ARM: mach-shmobile: cpuidle single/global and last_state fixes
  ARM: mach-shmobile: move helper macro PORTCR to sh_pfc.h
  ARM: mach-shmobile: move helper macro PORT_xx to sh_pfc.h
  ARM: mach-shmobile: move helper macro PORT_DATA_xx to sh_pfc.h
  ARM: mach-shmobile: ap4evb: remove white space from end of line
  ARM: mach-shmobile: clock-sh7372: remove un-necessary index
  ARM: mach-shmobile: kota2: add comment out separator
  ARM: mach-shmobile: sh73a0: add MMC data pin pull-up
---

7f80850d3f9fd8fda23a317044aef3a6bafab06b