From: Thomas Gleixner Date: Wed, 24 Apr 2013 18:33:46 +0000 (+0200) Subject: Merge branch 'linus' into timers/core X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=6402c7dc2a19c19bd8cdc7d80878b850da418942;p=linux.git Merge branch 'linus' into timers/core Reason: Get upstream fixes before adding conflicting code. Signed-off-by: Thomas Gleixner --- 6402c7dc2a19c19bd8cdc7d80878b850da418942