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

Conflicts:
	net/ipv4/fib_frontend.c

2010-12-26 22:37:05 -08:00

..

airport.c

powerpc/macio: Fix probing of macio devices by using the right of match table

2010-06-02 17:50:38 +10:00

cfg.c

drivers/net/wireless: Use wiphy_<level>

2010-07-27 15:14:13 -04:00

cfg.h

…

fw.c

drivers/net: use __packed annotation

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

fw.h

…

hermes_dld.c

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

2010-06-11 11:34:06 -07:00

hermes_dld.h

…

hermes_rid.h

…

hermes.c

orinoco_usb: implement fw download

2010-05-03 14:53:09 -04:00

hermes.h

drivers/net: use __packed annotation

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

hw.c

orinoco: Fix walking past the end of the buffer

2010-08-25 14:33:17 -04:00

hw.h

…

Kconfig

orinoco: add orinoco_usb driver

2010-05-03 14:53:08 -04:00

main.c

orinoco: clear countermeasure setting on commit

2010-12-08 15:23:52 -05:00

main.h

…

Makefile

orinoco: add orinoco_usb driver

2010-05-03 14:53:08 -04:00

mic.c

…

mic.h

…

orinoco_cs.c

orinoco: initialise priv->hw before assigning the interrupt

2010-12-08 15:23:31 -05:00

orinoco_nortel.c

orinoco: allow driver to specify netdev_ops

2010-05-03 14:53:06 -04:00

orinoco_pci.c

orinoco: allow driver to specify netdev_ops

2010-05-03 14:53:06 -04:00

orinoco_pci.h

…

orinoco_plx.c

orinoco: allow driver to specify netdev_ops

2010-05-03 14:53:06 -04:00

orinoco_tmd.c

orinoco: allow driver to specify netdev_ops

2010-05-03 14:53:06 -04:00

orinoco_usb.c

BKL: remove extraneous #include <smp_lock.h>

2010-11-17 08:59:32 -08:00

orinoco.h

drivers/net: use __packed annotation

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

scan.c

orinoco: abort scan on interface down

2010-11-30 13:23:05 -05:00

scan.h

orinoco: abort scan on interface down

2010-11-30 13:23:05 -05:00

spectrum_cs.c

orinoco: initialise priv->hw before assigning the interrupt

2010-12-08 15:23:31 -05:00

wext.c

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

2010-12-08 16:23:31 -05:00

wext.h

…