From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 3 May 2011 16:23:44 +0000 (-0700)
Subject: Merge branches 'x86-fixes-for-linus' and 'irq-fixes-for-linus' of git://git.kernel... 
X-Git-Tag: v2.6.39-rc6~5
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=bab0dcc717e28f76f10337a26ed5a14adcd786ce;p=~shefty%2Frdma-dev.git

Merge branches 'x86-fixes-for-linus' and 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, reboot: Fix relocations in reboot_32.S
  x86, NUMA: Fix empty memblk detection in numa_cleanup_meminfo()
  x86, AMD: Fix APIC timer erratum 400 affecting K8 Rev.A-E processors

* 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  genirq: Fix typo CONFIG_GENIRC_IRQ_SHOW_LEVEL
---

bab0dcc717e28f76f10337a26ed5a14adcd786ce