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

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-6000.c
	net/core/dev.c

2010-04-21 01:14:25 -07:00

..

af_packet.c

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

2010-04-21 01:14:25 -07:00

Kconfig

packet: Kill CONFIG_PACKET_MMAP.

2010-02-05 16:29:48 -08:00

Makefile

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00