David S. Miller 0a0e9ae1bd Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ...

Conflicts:
	drivers/net/bnx2x/bnx2x.h

2011-03-03 21:27:42 -08:00

..

af_netlink.c

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2011-03-03 21:27:42 -08:00

genetlink.c

Revert "netlink: test for all flags of the NLM_F_DUMP composite"

2011-01-19 13:34:20 -08:00

Makefile

netlink: Move netlink attribute parsing support to lib

2009-03-04 14:53:30 +08:00