Frederic Weisbecker 8f8ffe2485 Merge commit 'tracing/core' into tracing/kprobes ... Conflicts: kernel/trace/trace_export.c kernel/trace/trace_kprobe.c Merge reason: This topic branch lacks an important build fix in tracing/core: 0dd7b74787eaf7858c6c573353a83c3e2766e674: tracing: Fix double CPP substitution in TRACE_EVENT_FN that prevents from multiple tracepoint headers inclusion crashes. Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>		2009-09-11 01:09:23 +02:00
..
acpi	ACPI processor: force throttling state when BIOS returns incorrect value	2009-08-26 20:06:53 -07:00
asm-generic	mm: Pass virtual address to [__]p{te,ud,md}_free_tlb()	2009-07-27 12:10:38 -07:00
crypto	crypto: skcipher - Fix skcipher_dequeue_givcrypt NULL test	2009-08-29 20:44:04 +10:00
drm	drm/radeon: add GET_PARAM/INFO support for Z pipes	2009-08-21 19:10:30 +10:00
keys
linux	Merge commit 'tracing/core' into tracing/kprobes	2009-09-11 01:09:23 +02:00
math-emu
media	V4L/DVB (12283): gspca - sn9c20x: New subdriver for sn9c201 and sn9c202 bridges.	2009-07-24 14:03:30 -03:00
mtd
net	pkt_sched: Revert tasklet_hrtimer changes.	2009-09-01 17:59:25 -07:00
pcmcia
rdma
rxrpc
scsi	sd, sr: fix Driver 'sd' needs updating message	2009-06-21 12:01:27 -05:00
sound
trace	Merge commit 'tracing/core' into tracing/kprobes	2009-09-11 01:09:23 +02:00
video
xen
Kbuild