From: Ingo Molnar Date: Tue, 31 Jul 2012 15:05:27 +0000 (+0200) Subject: Merge branch 'linus' into timers/urgent X-Git-Tag: v3.6-rc2~37^2~5 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1f815faec46e83bc96039797151846b60875bb06;p=thirdparty%2Fkernel%2Flinux.git Merge branch 'linus' into timers/urgent Merge in Linus's branch which already has timers/core merged. Signed-off-by: Ingo Molnar --- 1f815faec46e83bc96039797151846b60875bb06