Merge remote-tracking branch 'origin/upstream/android-common-3.10' into linux-linaro...
author黄涛 <huangtao@rock-chips.com>
Thu, 21 Nov 2013 05:28:24 +0000 (13:28 +0800)
committer黄涛 <huangtao@rock-chips.com>
Thu, 21 Nov 2013 05:28:24 +0000 (13:28 +0800)
commit68a6548244be981d4844e143c166e5ef63f50d38
tree4ffea4d1d9a9278e28eb8c963685877bc6e5568a
parent1b62149c6e85d03a249cfd61b2f744b994134c2a
parent47128ea67fb2978b432c488bd1babb3e4eb16805
Merge remote-tracking branch 'origin/upstream/android-common-3.10' into linux-linaro-lsk-v3.10-android+android-common-3.10

Conflicts:
kernel/printk.c
drivers/staging/android/ion/ion_chunk_heap.c
kernel/printk.c