Stephen Rothwell 645dae969c tracing, net: fix net tree and tracing tree merge interaction ... Today's linux-next build (powerpc ppc64_defconfig) failed like this: In file included from net/core/skbuff.c:69: include/trace/skb.h:4: error: expected ')' before '(' token include/trace/skb.h:4: error: expected ')' before '(' token [...] Caused by commit 2939b0469d ("tracing: replace TP<var> with TP_<var>") from the tracing tree interacting with commit 4893d39e86 ("Network Drop Monitor: Add trace declaration for skb frees") from the net tree. Acked-by: David S. Miller <davem@davemloft.net> Signed-off-by: Ingo Molnar <mingo@elte.hu>		2009-04-02 00:50:30 +02:00
..
acpi
asm-arm
asm-frv	Merge branch 'tracing/core-v2' into tracing-for-linus	2009-04-02 00:49:02 +02:00
asm-generic	Merge branch 'tracing/core-v2' into tracing-for-linus	2009-04-02 00:49:02 +02:00
asm-h8300
asm-m32r	Merge branch 'tracing/core-v2' into tracing-for-linus	2009-04-02 00:49:02 +02:00
asm-mn10300	Merge branch 'tracing/core-v2' into tracing-for-linus	2009-04-02 00:49:02 +02:00
crypto
drm	drm: detect hdmi monitor by hdmi identifier (v3)	2009-03-29 18:31:49 +10:00
keys
linux	Merge branch 'tracing/core-v2' into tracing-for-linus	2009-04-02 00:49:02 +02:00
math-emu
media	V4L/DVB (11313): v4l2-subdev: add enum_framesizes and enum_frameintervals.	2009-03-30 12:43:49 -03:00
mtd	make MTD headers use strict integer types	2009-03-26 18:14:17 +01:00
net	netlabel: Cleanup the Smack/NetLabel code to fix incoming TCP connections	2009-03-28 15:01:37 +11:00
pcmcia
rdma	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2009-03-26 15:54:36 -07:00
rxrpc
scsi	[SCSI] iscsi class: remove host no argument from session creation callout	2009-03-13 15:29:39 -05:00
sound	V4L/DVB (10771): tea575x-tuner: convert it to V4L2 API	2009-03-30 12:43:02 -03:00
trace	tracing, net: fix net tree and tracing tree merge interaction	2009-04-02 00:50:30 +02:00
video	fbdev: update s1d13xxxfb to differ between revisions and production ids	2009-04-01 08:59:32 -07:00
xen
Kbuild