summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-05-03 09:23:44 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-05-03 09:23:44 -0700
commitbab0dcc717e28f76f10337a26ed5a14adcd786ce (patch)
tree78fb4b44b72705eb53afc5ce556c17f4f4e5c15c
parent497ff0344432d1c4ab493ce163a87410064b8d91 (diff)
parent7806a49ab625ebeb1709e5e87299b64932b807a7 (diff)
parent94b2c363dcf732a4edab4ed66041cb36e7f28fbf (diff)
downloadlinux-bab0dcc717e28f76f10337a26ed5a14adcd786ce.tar.bz2
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