Merge branch 'linus' into core/rcu

author Ingo Molnar <mingo@elte.hu>

Mon, 16 Jun 2008 09:23:36 +0000 (11:23 +0200)

committer Ingo Molnar <mingo@elte.hu>

Mon, 16 Jun 2008 09:23:36 +0000 (11:23 +0200)
author Ingo Molnar <mingo@elte.hu>
Mon, 16 Jun 2008 09:23:36 +0000 (11:23 +0200)
committer Ingo Molnar <mingo@elte.hu>
Mon, 16 Jun 2008 09:23:36 +0000 (11:23 +0200)
diff --cc drivers/infiniband/hw/ipath/ipath_verbs.c
Simple merge
diff --cc net/8021q/vlan.c
Simple merge
author	Ingo Molnar <mingo@elte.hu>
	Mon, 16 Jun 2008 09:23:36 +0000 (11:23 +0200)
committer	Ingo Molnar <mingo@elte.hu>
	Mon, 16 Jun 2008 09:23:36 +0000 (11:23 +0200)
		1	2
drivers/infiniband/hw/ipath/ipath_verbs.c	patch \|	diff1 \|	diff2 \|	blob \| history
net/8021q/vlan.c	patch \|	diff1 \|	diff2 \|	blob \| history