| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Mon, 14 Nov 2011 08:47:04 +0000 (06:47 -0200) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Mon, 14 Nov 2011 08:47:04 +0000 (06:47 -0200) | ||
| commit | 7f80850d3f9fd8fda23a317044aef3a6bafab06b | |
| tree | 4b98a9aa01f1479ab5abfbafcb1a3d9b6e332d34 | tree | snapshot (tar.xz tar.gz zip) |
| parent | b93cd6a0c7352b428ba2b8437b44fff6e76d81d2 | commit | diff |
| parent | b73b5c493ac001870bd9faf565a61908c82f52d8 | commit | diff |
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
* '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