Merge remote-tracking branch 'aosp/android-3.0' into develop-3.0
author黄涛 <huangtao@rock-chips.com>
Tue, 10 Jan 2012 08:22:59 +0000 (16:22 +0800)
committer黄涛 <huangtao@rock-chips.com>
Tue, 10 Jan 2012 08:22:59 +0000 (16:22 +0800)
commitaf3be323f4f4d5ec3948b1870b2e26908d06afab
treea8c3032a02d93603d519741547b8977750e3b159
parent7286c791f700dde88c5add67444a19b387af5fdf
parentf16e6fb3e3bbbc279579b3c3def7951787c88a0a
Merge remote-tracking branch 'aosp/android-3.0' into develop-3.0

Conflicts:
drivers/net/wireless/bcm4329/dhd_common.c
drivers/mmc/core/bus.c