From: Rusty Russell <rusty@rustcorp.com.au>
Date: Sat, 13 Dec 2008 11:25:51 +0000 (+1030)
Subject: Merge ../linux-2.6-x86
X-Git-Tag: v2.6.29-rc1~538^2~24^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=968ea6d80e395cf11a51143cfa1b9a14ada676df;p=pandora-kernel.git

Merge ../linux-2.6-x86

Conflicts:

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

968ea6d80e395cf11a51143cfa1b9a14ada676df
Reading git-diff-tree failed