From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 7 Apr 2011 19:49:01 +0000 (-0700)
Subject: Merge branch 'rmobile-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v2.6.39-rc3~15
X-Git-Url: http://git.samba.org/samba.git/?a=commitdiff_plain;h=174457391a83d70215d441cb3bc0aa7d7443b63e;p=sfrench%2Fcifs-2.6.git

Merge branch 'rmobile-fixes-for-linus' of git://git./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: arch-shmobile: only run FSI init on respective boards
  ARM: arch-shmobile: only run HDMI init on respective boards
  ARM: mach-shmobile: Correctly check for CONFIG_MACH_MACKEREL
---

174457391a83d70215d441cb3bc0aa7d7443b63e