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)
commit4d426f612e5ed7e45afb695bfbd78dcb5f16ec3e
tree13d0c9df6f4e2d72243d3c6065d2dba40a046d17
parent8315cce6bbbec3935e2eff81058a4773ceb4a05d
parent425f051d39fbd5c23c1b7cc2293e9d403c00022e
Merge remote-tracking branch 'origin/upstream/linux-linaro-lsk-v3.10-android' into linux-linaro-lsk-v3.10-android+android-common-3.10

Conflicts:
kernel/printk.c