黄涛 19b3e31e91 Merge remote-tracking branch 'aosp/android-3.0' into develop-3.0-jb ... Conflicts: drivers/mmc/core/core.c drivers/net/wireless/bcm4319/dhd_sdio.c drivers/net/wireless/bcm4319/include/linux_osl.h drivers/net/wireless/bcm4319/wl_iw.c drivers/net/wireless/bcmdhd/dhd.h drivers/net/wireless/bcmdhd/dhd_cfg80211.c drivers/net/wireless/bcmdhd/dhd_linux.c drivers/net/wireless/bcmdhd/include/wlioctl.h drivers/net/wireless/bcmdhd/wl_cfg80211.c drivers/net/wireless/bcmdhd/wldev_common.c drivers/net/wireless/bcmdhd/wldev_common.h		2012-08-21 15:53:18 +08:00
..
acpi	ACPI: Store SRAT table revision	2012-01-25 17:24:57 -08:00
asm-generic	Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0-jb	2012-07-12 18:46:41 +08:00
crypto
drm	drm/radeon/kms: add new BTC PCI ids	2012-06-10 00:33:04 +09:00
keys	Revert "Merge remote-tracking branch 'linux-2.6.32.y/master' into develop"	2011-07-30 16:09:59 +08:00
linux	Merge remote-tracking branch 'aosp/android-3.0' into develop-3.0-jb	2012-08-21 15:53:18 +08:00
math-emu	Revert "Merge remote branch 'linux-2.6.32.y/master' into develop"	2011-07-30 16:24:52 +08:00
media	camera rk30: fix struct rk_camera_work may be reentrant,version update to v0.2.11, and add support sp2518 sensor	2012-08-14 15:11:36 +08:00
mtd
net	Merge remote-tracking branch 'origin/develop-3.0' into develop-3.0-jb	2012-08-21 14:14:24 +08:00
pcmcia
rdma
rxrpc
scsi	Revert "Merge commit 'v2.6.32.9' into android-2.6.32"	2011-07-30 22:24:29 +08:00
sound	add incalling cannot suspend interface	2012-02-11 16:18:12 +08:00
target	target: Set additional sense length field in sense data	2012-01-25 17:25:00 -08:00
trace	Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0-jb	2012-08-21 13:11:48 +08:00
video	OMAPDSS: HDMI: PHY burnout fix	2012-03-12 10:32:59 -07:00
xen	xen/xenbus: Reject replies with payload > XENSTORE_PAYLOAD_MAX.	2012-01-25 17:24:41 -08:00
Kbuild