David S. Miller 88c5100c28 Merge branch 'master' of github.com:davem330/net ... Conflicts: net/batman-adv/soft-interface.c		2011-10-07 13:38:43 -04:00
..
core	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband	2011-07-22 14:50:12 -07:00
hw	Merge branch 'master' of github.com:davem330/net	2011-10-07 13:38:43 -04:00
ulp	Merge branch 'master' of github.com:davem330/net	2011-09-22 03:23:13 -04:00
Kconfig	RDMA: Add netlink infrastructure	2011-05-20 11:46:11 -07:00
Makefile