From: Rusty Russell <rusty@rustcorp.com.au>
Date: Wed, 31 Dec 2008 12:35:57 +0000 (+1030)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
X-Git-Tag: v2.6.29-rc1~521^2~11^2~33
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2ca1a615835d9f4990f42102ab1f2ef434e7e89c;p=pandora-kernel.git

Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux-2.6

Conflicts:

	arch/x86/kernel/io_apic.c
---

2ca1a615835d9f4990f42102ab1f2ef434e7e89c
Reading git-diff-tree failed