David S. Miller 9eeda9abd1 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/wireless/ath5k/base.c net/8021q/vlan_core.c		2008-11-06 22:43:03 -08:00
..
core	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2008-11-06 22:43:03 -08:00
hw	drivers: replace NIPQUAD()	2008-10-31 00:56:00 -07:00
ulp	drivers: replace NIPQUAD()	2008-10-31 00:56:00 -07:00
Kconfig
Makefile