linux/drivers/infiniband
David S. Miller 49997d7515 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:

	Documentation/powerpc/booting-without-of.txt
	drivers/atm/Makefile
	drivers/net/fs_enet/fs_enet-main.c
	drivers/pci/pci-acpi.c
	net/8021q/vlan.c
	net/iucv/iucv.c
2008-07-18 02:39:39 -07:00
..
core RDMA/cma: Simplify locking needed for serialization of callbacks 2008-07-14 23:48:53 -07:00
hw Merge branch 'core/rcu' into core/rcu-for-linus 2008-07-15 21:10:12 +02:00
ulp Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 2008-07-18 02:39:39 -07:00
Kconfig
Makefile