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

Conflicts:
	drivers/net/bonding/bond_main.c
	drivers/net/via-velocity.c
	drivers/net/wireless/iwlwifi/iwl-agn.c

2010-04-06 23:53:30 -07:00

..

af_netlink.c

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

2010-04-06 23:53:30 -07:00

genetlink.c

netlink: Export genl_lock() API for use by modules

2010-04-03 14:56:05 -07:00

Makefile

netlink: Move netlink attribute parsing support to lib

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