Merge branch 'sh/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 27 Jun 2010 15:18:20 +0000 (08:18 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 27 Jun 2010 15:18:20 +0000 (08:18 -0700)
commitbf2937695fe2330bfd8933a2310e7bdd2581dc2e
tree66286a4ae2bf4d5c317e7270b92effa570e7f1d7
parent1a5f20fe197f814fc0b29173894a706f478db821
parent5967d33ce8a030f01a716fc0b25fcb03744a5fda
Merge branch 'sh/for-linus' of git://git./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