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)
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)
diff --cc drivers/staging/android/ion/ion_chunk_heap.c
Simple merge
diff --cc kernel/printk.c
Simple merge
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)
		1	2
drivers/staging/android/ion/ion_chunk_heap.c	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/printk.c	patch \|	diff1 \|	diff2 \|	blob \| history