Merge "Add the "timers: do not raise softirq unconditionally" temporarily"
authorYunhong Jiang <yunhong.jiang@intel.com>
Fri, 22 Jul 2016 17:10:32 +0000 (17:10 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Fri, 22 Jul 2016 17:10:32 +0000 (17:10 +0000)

Trivial merge