Merge branch 'upstream/android-3.10' into linaro-fixes/android-3.10

Update to latest android-3.10 branch.

Minor conflict with the direct printk stuff

Signed-off-by: John Stultz <john.stultz@linaro.org>

diff --cc drivers/staging/android/ion/ion_chunk_heap.c
Simple merge

diff --cc kernel/printk.c
Simple merge