Ingo Molnar cc0104e877 Merge branch 'linus' into tracing/urgent ... Conflicts: kernel/trace/trace_kprobe.c Merge reason: resolve the conflict. Signed-off-by: Ingo Molnar <mingo@elte.hu>		2009-12-14 09:16:49 +01:00
..
acpi	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq	2009-12-11 15:59:23 -08:00
asm-generic	Merge git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic	2009-12-11 20:57:31 -08:00
crypto
drm	drm/nouveau: Add DRM driver for NVIDIA GPUs	2009-12-11 21:29:34 +10:00
keys
linux	Merge branch 'linus' into tracing/urgent	2009-12-14 09:16:49 +01:00
math-emu
media	V4L/DVB (13540): ir-common: Cleanup get key evdev code	2009-12-05 18:42:22 -02:00
mtd
net	Merge branch 'master' of /home/davem/src/GIT/linux-2.6/	2009-12-11 17:12:17 -08:00
pcmcia	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2009-12-05 09:42:59 -08:00
rdma
rxrpc
scsi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6	2009-12-09 19:42:25 -08:00
sound	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-12-09 19:43:33 -08:00
trace	Merge branch 'linus' into tracing/urgent	2009-12-14 09:16:49 +01:00
video	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-12-09 19:43:33 -08:00
xen
Kbuild