Merge remote-tracking branch 'origin/develop-3.10' into develop-3.10-next
author黄涛 <huangtao@rock-chips.com>
Mon, 4 Aug 2014 08:52:07 +0000 (16:52 +0800)
committer黄涛 <huangtao@rock-chips.com>
Mon, 4 Aug 2014 08:52:07 +0000 (16:52 +0800)
commit4b19ba34771e5f82ba6cf16bc7cc6b0b480369de
tree30307170c4b8667c340c14579ab7afc747819a5c
parent3a37be7ce1646a45e62e3d866babddf05b4fcee6
parent66db73c14bd16d8ad05ecb80e6bf6050d8828467
Merge remote-tracking branch 'origin/develop-3.10' into develop-3.10-next

Conflicts:
drivers/staging/android/ion/ion.c
include/linux/rockchip/sysmmu.h
arch/arm/mach-rockchip/Makefile
include/linux/rockchip/sysmmu.h