David S. Miller da935c66ba Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: Documentation/feature-removal-schedule.txt drivers/net/e1000e/netdev.c net/xfrm/xfrm_policy.c		2011-02-19 19:17:35 -08:00
..
core	Merge branches 'amso1100', 'cma', 'cxgb4', 'misc', 'mlx4' and 'qib' into for-next	2011-01-29 20:45:04 -08:00
hw	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2011-02-19 19:17:35 -08:00
ulp	kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT	2011-01-20 17:02:05 -08:00
Kconfig	Update broken web addresses in the kernel.	2010-10-18 11:03:14 +02:00
Makefile	IB/qib: Add new qib driver for QLogic PCIe InfiniBand adapters	2010-05-23 21:44:54 -07:00