summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-shmobile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-03-14 19:15:45 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2010-03-14 19:15:45 +0100
commitbca14dd14f3b0c5e3e2d1d314679f85b67871365 (patch)
treee2da281ecf99e9ea009c71cea947440d2b06afed /arch/arm/mach-shmobile
parentAdd include to i2c-xii.c to fix build error (diff)
parentx86/mce: Fix build bug with CONFIG_PROVE_LOCKING=y && CONFIG_X86_MCE_INTEL=y (diff)
downloadlinux-bca14dd14f3b0c5e3e2d1d314679f85b67871365.tar.xz
linux-bca14dd14f3b0c5e3e2d1d314679f85b67871365.zip
Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86/mce: Fix build bug with CONFIG_PROVE_LOCKING=y && CONFIG_X86_MCE_INTEL=y
Diffstat (limited to 'arch/arm/mach-shmobile')
0 files changed, 0 insertions, 0 deletions