From: Ingo Molnar Date: Wed, 25 Jul 2012 19:40:40 +0000 (+0200) Subject: Merge branch 'linus' into x86/urgent X-Git-Tag: v3.6-rc2~36^2~5 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d431adfbc9b7de651f3164c6b7ffcad75805d7e4;p=thirdparty%2Flinux.git Merge branch 'linus' into x86/urgent Merge in Linus's tree to avoid a conflict. Signed-off-by: Ingo Molnar --- d431adfbc9b7de651f3164c6b7ffcad75805d7e4