黄涛 a01580d71e Merge remote-tracking branch 'remotes/tegra/android-tegra-2.6.36' into develop-2.6.36 ... Conflicts: drivers/mmc/host/sdhci-tegra.c drivers/net/wireless/bcm4329/dhd_common.c drivers/net/wireless/bcm4329/dhd_custom_gpio.c		2011-08-01 00:17:16 +08:00
..
acpi	Revert "Merge commit 'v2.6.32.9' into android-2.6.32"	2011-07-30 22:24:29 +08:00
asm-generic	Merge remote-tracking branch 'remotes/tegra/android-tegra-2.6.36-honeycomb-mr1' into develop-2.6.36	2011-08-01 00:04:45 +08:00
crypto	crypto: skcipher - Add ablkcipher_walk interfaces	2010-05-19 14:13:07 +10:00
drm	Revert "Merge commit 'v2.6.32.9' into android-2.6.32"	2011-07-30 22:24:29 +08: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 'remotes/tegra/android-tegra-2.6.36' into develop-2.6.36	2011-08-01 00:17:16 +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	Merge remote-tracking branch 'remotes/tegra/android-tegra-2.6.36-honeycomb-mr1' into develop-2.6.36	2011-08-01 00:04:45 +08:00
mtd	mtd: Update copyright notices	2010-08-08 20:58:20 +01:00
net	Revert "net: socket ioctl to reset connections matching local address"	2011-07-30 22:57:37 +08:00
pcmcia	pcmcia: use struct resource for PCMCIA devices, part 2	2010-08-03 09:04:16 +02:00
rdma	IB: Rename RAW_ETY to RAW_ETHERTYPE	2010-08-04 10:44:19 -07:00
rxrpc	net: use __packed annotation	2010-06-03 03:21:52 -07:00
scsi	Revert "Merge commit 'v2.6.32.9' into android-2.6.32"	2011-07-30 22:24:29 +08:00
sound	Merge remote-tracking branch 'remotes/tegra/android-tegra-2.6.36-honeycomb-mr1' into develop-2.6.36	2011-08-01 00:04:45 +08:00
trace	Revert "Merge commit 'v2.6.32.9' into android-2.6.32"	2011-07-30 22:24:29 +08:00
video	video: tegra: add support for tiled surfaces	2011-05-24 13:55:12 -07:00
xen	xen: Provide a variant of __RING_SIZE() that is an integer constant expression	2011-01-07 13:58:31 -08:00
Kbuild