diff options
| author | Linus Torvalds <[email protected]> | 2011-05-03 16:23:44 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2011-05-03 16:23:44 +0000 |
| commit | bab0dcc717e28f76f10337a26ed5a14adcd786ce (patch) | |
| tree | 78fb4b44b72705eb53afc5ce556c17f4f4e5c15c /security/selinux/hooks.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dto... (diff) | |
| parent | x86, reboot: Fix relocations in reboot_32.S (diff) | |
| parent | genirq: Fix typo CONFIG_GENIRC_IRQ_SHOW_LEVEL (diff) | |
| download | kernel-bab0dcc717e28f76f10337a26ed5a14adcd786ce.tar.gz kernel-bab0dcc717e28f76f10337a26ed5a14adcd786ce.zip | |
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