From: Thomas Gleixner Date: Tue, 19 May 2015 14:12:32 +0000 (+0200) Subject: Merge branch 'linus' into timers/core X-Git-Tag: firefly_0821_release~176^2~1622^2~42 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c3b5d3cea508d2c8ff493ef18c45a9cc58fb7015;p=firefly-linux-kernel-4.4.55.git Merge branch 'linus' into timers/core Make sure the upstream fixes are applied before adding further modifications. --- c3b5d3cea508d2c8ff493ef18c45a9cc58fb7015