From: Ingo Molnar <mingo@elte.hu>
Date: Tue, 31 Mar 2009 11:53:43 +0000 (+0200)
Subject: Merge branch 'linus' into locking-for-linus
X-Git-Tag: v2.6.30-rc1~181^2~2
X-Git-Url: http://git.cascardo.info/?a=commitdiff_plain;h=7bee946358c3cb957d4aa648fc5ab3cad0b232d0;p=cascardo%2Flinux.git

Merge branch 'linus' into locking-for-linus

Conflicts:
	lib/Kconfig.debug
---

7bee946358c3cb957d4aa648fc5ab3cad0b232d0