Colin Cross bedd07edd3 Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36 ... Conflicts: arch/arm/mach-tegra/tegra_i2s_audio.c Change-Id: I9e2892c49d97c63de3a8e5797d6d9a123ae2d161		2010-10-14 17:19:09 -07:00
..
acpi	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6	2010-09-07 16:00:17 -07:00
asm-generic	gpio: doc updates	2010-09-09 18:57:24 -07:00
crypto
drm	drm: Use a nondestructive mode for output detect when polling (v2)	2010-09-14 20:38:48 +10:00
keys	DNS: Separate out CIFS DNS Resolver code	2010-08-05 17:17:51 +00:00
linux	Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36	2010-10-14 17:19:09 -07:00
math-emu
media	media: video: tegra: ov5650: Clean up headers to match latest userspace	2010-10-06 17:01:33 -07:00
mtd	mtd: Update copyright notices	2010-08-08 20:58:20 +01:00
net	net: activity_stats: Add statistics for network transmission activity	2010-09-29 17:49:37 -07: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
scsi	scsi: use __uX types for headers exported to user space	2010-08-11 08:59:01 -07:00
sound	ALSA: emu10k1 - delay the PCM interrupts (add pcm_irq_delay parameter)	2010-08-18 15:10:59 +02:00
trace	Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2010-08-24 12:21:49 -07:00
video	tegra: revert a bunch of changes	2010-10-08 16:06:17 -07:00
xen	xen: pvhvm: make it clearer that XEN_UNPLUG_* define bits in a bitfield	2010-08-23 12:01:35 +01:00
Kbuild