From: Thomas Gleixner Date: Wed, 24 Apr 2013 18:33:46 +0000 (+0200) Subject: Merge branch 'linus' into timers/core X-Git-Tag: v3.10-rc1~171^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6402c7dc2a19c19bd8cdc7d80878b850da418942;p=thirdparty%2Fkernel%2Flinux.git Merge branch 'linus' into timers/core Reason: Get upstream fixes before adding conflicting code. Signed-off-by: Thomas Gleixner --- 6402c7dc2a19c19bd8cdc7d80878b850da418942