From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 29 Aug 2011 20:34:48 +0000 (-0700)
Subject: Merge branch 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v3.1-rc5~15
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c42a2634d8495a764e918a8c4252c100ef23b369;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git

Merge branch 'sh-fixes-for-linus' of git://git./linux/kernel/git/lethal/sh-3.x

* 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-3.x:
  sh: fix the compile error in setup-sh7757.c
  serial: sh-sci: report CTS as active for get_mctrl
  sh: Add unaligned memory access for PC relative intructions
  sh: Fix unaligned memory access for branches without delay slots
  sh: Fix up fallout from cpuidle changes.
  serial: sh-sci: console Runtime PM support
  sh: Fix conflicting definitions of ptrace_triggered
  serial: sh-sci: fix DMA build by including dma-mapping.h
  serial: sh-sci: Fix up default regtype probing.
  sh: intc: enable both edges GPIO interrupts on sh7372
  shwdt: fix usage of mod_timer
  clocksource: sh_cmt: wait for CMCNT on init V2
---

c42a2634d8495a764e918a8c4252c100ef23b369