commit bab0dcc717e28f76f10337a26ed5a14adcd786ce
author Linus Torvalds <torvalds@linux-foundation.org> Tue May 03 09:23:44 2011 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Tue May 03 09:23:44 2011 -0700
tree 78fb4b44b72705eb53afc5ce556c17f4f4e5c15c
parent 497ff0344432d1c4ab493ce163a87410064b8d91
parent 7806a49ab625ebeb1709e5e87299b64932b807a7
parent 94b2c363dcf732a4edab4ed66041cb36e7f28fbf

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