From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 15 Nov 2010 16:41:30 +0000 (-0800)
Subject: Merge branches 'sh-fixes-for-linus' and 'rmobile-fixes-for-linus' of git://git.kernel... 
X-Git-Tag: v3.12-rc1~8162
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=58e89c274f202d7fd59694b7b74fa676018435a2;p=kernel%2Fkernel-generic.git

Merge branches 'sh-fixes-for-linus' and 'rmobile-fixes-for-linus' of git://git./linux/kernel/git/lethal/sh-2.6

* 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
  sh: intc: Fix up build failure introduced by radix tree changes.
  MAINTAINERS: update the sh git tree entry.
  sh: clkfwk: fix up compiler warnings.
  sh: intc: Fix up initializers for gcc 4.5.
  rtc: rtc-sh - fix a memory leak

* 'rmobile-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
  ARM: mach-shmobile: ap4evb: add fsib 44100Hz rate
  MAINTAINERS: update the ARM SH-Mobile git tree entry.
  ARM: mach-shmobile: ap4evb: Mark NOR boot loader partitions read-only.
  ARM: mach-shmobile: intc-sh7372: fix interrupt number
---

58e89c274f202d7fd59694b7b74fa676018435a2