]> nv-tegra.nvidia Code Review - linux-2.6.git/commit
Merge branches 'x86/cleanups', 'x86/cpu', 'x86/debug', 'x86/mce2', 'x86/mm', 'x86...
authorIngo Molnar <mingo@elte.hu>
Wed, 18 Mar 2009 12:19:49 +0000 (13:19 +0100)
committerIngo Molnar <mingo@elte.hu>
Wed, 18 Mar 2009 12:19:49 +0000 (13:19 +0100)
commit705bb9dc72b2464a7e421ee45d5e4a3f206d5c75
tree4ca54c86d3661b3a4ae2b63aa9ead20835a422d1
parent250981e6e1ef04947eccaa55e8c25ddcaa47a02e
parent48f4c485c275e9550fa1a1191768689cc3ae0037
parentf4c3c4cdb1de232ff37cf4339eb2f36c84e20da6
parenta6b6a14e0c60561f2902b078bd28d0e61defad70
parent0920dce7d5889634faa336f65833ee44f3b7651e
parent4e16c888754468a58d4829c2eba2c6aa3a065e2b
parentbe721696cac9d66566d59b205ee573ecb2f7c35b
parent0a699af8e613a670be50245366fa18cb19ac5172
parent42854dc0a6320ff36722749acafa0697522d9556
parent2c74d66624ddbda8101d54d1e184cf9229b378bc
parentce4e240c279a31096f74afa6584a62d64a1ba8c8
parentee568b25ee9e160b32d1aef73d8b2ee9c05d34db
Merge branches 'x86/cleanups', 'x86/cpu', 'x86/debug', 'x86/mce2', 'x86/mm', 'x86/mtrr', 'x86/setup', 'x86/setup-memory', 'x86/urgent', 'x86/uv', 'x86/x2apic' and 'linus' into x86/core

Conflicts:
arch/parisc/kernel/irq.c
arch/parisc/kernel/irq.c
arch/x86/include/asm/paravirt.h
arch/x86/kernel/tsc.c
drivers/acpi/osl.c