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

Conflicts:
	drivers/net/wireless/iwmc3200wifi/netdev.c
	net/wireless/scan.c

2009-07-23 19:03:51 -07:00

..

x86

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

2009-07-23 19:03:51 -07:00

Kconfig

create drivers/platform/x86/ from drivers/misc/

2008-12-19 04:42:32 -05:00

Makefile

create drivers/platform/x86/ from drivers/misc/

2008-12-19 04:42:32 -05:00