Merge branch 'linus' into core/rcu
Ingo Molnar [Mon, 16 Jun 2008 09:23:36 +0000 (11:23 +0200)]
1  2 
drivers/infiniband/hw/ipath/ipath_verbs.c
net/8021q/vlan.c

Simple merge