From: Ingo Molnar <mingo@elte.hu>
Date: Wed, 4 Mar 2009 10:42:31 +0000 (+0100)
Subject: Merge commit 'v2.6.29-rc7' into perfcounters/core
X-Git-Tag: v2.6.31-rc1~383^2~494
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8163d88c79dca35478a2405c837733ac50ea4c39;p=thirdparty%2Fkernel%2Flinux.git

Merge commit 'v2.6.29-rc7' into perfcounters/core

Conflicts:
	arch/x86/mm/iomap_32.c
---

8163d88c79dca35478a2405c837733ac50ea4c39