From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 27 Jun 2010 15:18:20 +0000 (-0700)
Subject: Merge branch 'sh/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal... 
X-Git-Tag: v2.6.35-rc4~56
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=bf2937695fe2330bfd8933a2310e7bdd2581dc2e;p=linux.git

Merge branch 'sh/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

* 'sh/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
  clocksource: sh_cmt: Fix up bogus shift value.
  arch/sh/mm: Eliminate a double lock
  sh: Fix up IORESOURCE_PCI_FIXED usage in pcibios_fixup_device_resources().
  sh: remove duplicated #include
---

bf2937695fe2330bfd8933a2310e7bdd2581dc2e