Frederic Weisbecker d7a4b414ee Merge commit 'linus/master' into tracing/kprobes ...

Conflicts:
	kernel/trace/Makefile
	kernel/trace/trace.h
	kernel/trace/trace_event_types.h
	kernel/trace/trace_export.c

Merge reason:
	Sync with latest significant tracing core changes.

2009-09-23 23:08:43 +02:00

..

acpi

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6

2009-09-23 09:32:11 -07:00

asm-generic

Merge branch 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2009-09-23 09:46:15 -07:00

crypto

Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

2009-09-11 09:38:37 -07:00

drm

Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6

2009-09-21 08:10:09 -07:00

keys

RxRPC: Use uX/sX rather than uintX_t/intX_t types

2009-09-16 00:01:13 -07:00

linux

Merge commit 'linus/master' into tracing/kprobes

2009-09-23 23:08:43 +02:00

math-emu

…

media

V4L/DVB (13019): video: initial support for ADV7180

2009-09-19 00:53:39 -03:00

mtd

…

net

pkt_sched: Fix tx queue selection in tc_modify_qdisc

2009-09-15 02:53:07 -07:00

pcmcia

pcmcia: Use phys_addr_t for physical addresses

2009-09-15 10:17:15 -07:00

rdma

trivial: fix typo "to to" in multiple files

2009-09-21 15:14:55 +02:00

rxrpc

…

scsi

trivial: remove unnecessary semicolons

2009-09-21 15:14:58 +02:00

sound

Merge branch 'topic/ymfpci' into for-linus

2009-09-10 15:33:09 +02:00

trace

Merge commit 'linus/master' into tracing/kprobes

2009-09-23 23:08:43 +02:00

video

davinci-fb-frame-buffer-driver-for-ti-da8xx-omap-l1xx-v4

2009-09-23 07:39:51 -07:00

xen

…

Kbuild

…