Merge branch 'master' into bugfix/uart_isr_switch_context

This commit is contained in:
Wangjialin
2016-11-16 17:11:18 +08:00