summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-06-04 07:53:23 +0900
committerLinus Torvalds <torvalds@linux-foundation.org>2011-06-04 07:53:23 +0900
commitcd4ecf877a4d629c38571405fd649077c12dec50 (patch)
treeac0c5a72b503e1debbc06a10682f4a551bc304ac /Makefile
parent1f3bd0f2ac870c9eb29590f193ee3d94e2d35514 (diff)
parent816af7422f5bdbb74a0c9bb09735a9aeb9522c30 (diff)
downloadlinux-cd4ecf877a4d629c38571405fd649077c12dec50.tar.bz2
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
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions