From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 7 Apr 2011 19:48:45 +0000 (-0700)
Subject: Merge branch 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: MMI-PSA29.97-13-9~20000
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=26cf445721763d61b08ce394f8bdbd4c5610b563;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'sh-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: select ARCH_NO_SYSDEV_OPS.
  sh: fix build error in board-sh7757lcr.c
  sh: landisk: Remove whitespace
  sh: landisk: Remove mv_nr_irqs
  sh: sh-sci: Fix double initialization by serial_console_setup
  serial: sh-sci: prevent setup of uninitialized serial console
  dma: shdma: add checking the DMAOR_AE in sh_dmae_err
---

26cf445721763d61b08ce394f8bdbd4c5610b563