| commit | cd4ecf877a4d629c38571405fd649077c12dec50 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sat Jun 04 07:53:23 2011 +0900 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sat Jun 04 07:53:23 2011 +0900 |
| tree | ac0c5a72b503e1debbc06a10682f4a551bc304ac | |
| parent | 1f3bd0f2ac870c9eb29590f193ee3d94e2d35514 [diff] | |
| parent | 816af7422f5bdbb74a0c9bb09735a9aeb9522c30 [diff] |
Merge branch 'rmobile-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 * 'rmobile-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: ARM: mach-shmobile: add DMAC clock definitions on SH7372 ARM: arch-shmobile: support SDHI card detection on mackerel, using a GPIO sh_mobile_meram: MERAM platform data for LCDC