Merge remote-tracking branch 'origin/upstream/linux-linaro-lsk-v3.10-android' into...
author黄涛 <huangtao@rock-chips.com>
Tue, 17 Dec 2013 06:41:09 +0000 (14:41 +0800)
committer黄涛 <huangtao@rock-chips.com>
Tue, 17 Dec 2013 06:41:09 +0000 (14:41 +0800)
Conflicts:
kernel/printk.c


Trivial merge