From: Linus Torvalds 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-Url: https://git.stricted.de/?a=commitdiff_plain;h=bf2937695fe2330bfd8933a2310e7bdd2581dc2e;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git 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 --- bf2937695fe2330bfd8933a2310e7bdd2581dc2e