diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-26 01:51:51 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-26 01:51:51 +0100 |
commit | 26ff6801f751cd47e44c2e9507ec08b447f2d2b9 (patch) | |
tree | a6bd5286e4a1ab4f96847300cb8d961ada62a231 /kernel/tsacct.c | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ger... (diff) | |
parent | x86: DT: Cleanup namespace and call irq_set_irq_type() unconditional (diff) | |
download | linux-26ff6801f751cd47e44c2e9507ec08b447f2d2b9.tar.xz linux-26ff6801f751cd47e44c2e9507ec08b447f2d2b9.zip |
Merge branch 'x86-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: DT: Cleanup namespace and call irq_set_irq_type() unconditional
x86: DT: Fix return condition in irq_create_of_mapping()
x86, mpparse: Move check_slot into CONFIG_X86_IO_APIC context
Diffstat (limited to 'kernel/tsacct.c')
0 files changed, 0 insertions, 0 deletions