tree dc2acec8c9bdced33afe1e273ee5e0b0b93d2703
parent 7be7585393d311866653564fbcd10a3232773c0b
parent 8299608f140ae321e4eb5d1306184265d2b9511e
author Rusty Russell <rusty@rustcorp.com.au> 1229167551 +1030
committer Rusty Russell <rusty@rustcorp.com.au> 1229167551 +1030

Merge ../linux-2.6-x86

Conflicts:

	arch/x86/kernel/io_apic.c
	kernel/sched.c
	kernel/sched_stats.h