Merge remote-tracking branch 'origin/develop-3.0' into develop-3.0-jb
author黄涛 <huangtao@rock-chips.com>
Tue, 21 Aug 2012 06:14:24 +0000 (14:14 +0800)
committer黄涛 <huangtao@rock-chips.com>
Tue, 21 Aug 2012 06:14:24 +0000 (14:14 +0800)
commitb2be450f10a186dbddc94f2ecc8209641bc42cc6
tree50180848187463b05e6d7078dcdfb33bcbd0d746
parent109b0ba09445a8f5ac1c15cccc689f68236f7e41
parentbeb9e50ebc85126c78554632f50ec6bcfa0da55e
Merge remote-tracking branch 'origin/develop-3.0' into develop-3.0-jb

Conflicts:
include/net/cfg80211.h
14 files changed:
Makefile
arch/arm/Kconfig
arch/arm/configs/rk3066_sdk_defconfig
arch/arm/configs/rk30_ds1001b_defconfig
arch/arm/configs/rk30_sdk_defconfig
drivers/mmc/card/block.c
drivers/mmc/core/core.c
drivers/mmc/core/sd.c
drivers/tty/serial/Kconfig
drivers/usb/gadget/android.c
drivers/usb/gadget/f_adb.c
drivers/usb/serial/option.c
include/net/cfg80211.h
net/bluetooth/hci_core.c