John W. Linville e300d955de Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem ...

Conflicts:
	drivers/net/wireless/wl12xx/wl1271_cmd.h

2010-07-13 15:57:29 -04:00

..

isl_38xx.c

…

isl_38xx.h

…

isl_ioctl.c

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem

2010-07-13 15:57:29 -04:00

isl_ioctl.h

…

isl_oid.h

drivers/net: use __packed annotation

2010-06-03 03:18:23 -07:00

islpci_dev.c

drivers/net: remove useless semicolons

2010-05-17 22:47:34 -07:00

islpci_dev.h

prism54: convert to internal net_device_stats

2009-03-21 22:51:23 -07:00

islpci_eth.c

net: trans_start cleanups

2010-05-10 05:01:31 -07:00

islpci_eth.h

drivers/net: use __packed annotation

2010-06-03 03:18:23 -07:00

islpci_hotplug.c

drivers/net/: use DEFINE_PCI_DEVICE_TABLE()

2010-01-07 23:54:26 -08:00

islpci_mgt.c

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem

2010-04-15 16:21:34 -04:00

islpci_mgt.h

drivers/net: use __packed annotation

2010-06-03 03:18:23 -07:00

Makefile

…

oid_mgt.c

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem

2010-04-15 16:21:34 -04:00

oid_mgt.h

…

prismcompat.h

…