David S. Miller 28b4d5cc17 Merge branch 'master' of /home/davem/src/GIT/linux-2.6/ ...

Conflicts:
	drivers/net/pcmcia/fmvj18x_cs.c
	drivers/net/pcmcia/nmclan_cs.c
	drivers/net/pcmcia/xirc2ps_cs.c
	drivers/net/wireless/ray_cs.c

2009-12-05 15:22:26 -08:00

..

b43.h

b43: Remove deprecated 'qual' from returned RX status

2009-11-06 16:49:09 -05:00

debugfs.c

…

debugfs.h

…

dma.c

b43: Rewrite DMA Tx status handling sanity checks

2009-11-23 17:05:28 -05:00

dma.h

b43: Rewrite DMA Tx status handling sanity checks

2009-11-23 17:05:28 -05:00

Kconfig

…

leds.c

b43: fix two warnings

2009-12-04 14:16:25 -05:00

leds.h

…

lo.c

…

lo.h

…

main.c

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

2009-11-11 11:38:16 -08:00

main.h

…

Makefile

…

pcmcia.c

pcmcia: rework the irq_req_t typedef

2009-11-28 18:03:14 +01:00

pcmcia.h

…

phy_a.c

…

phy_a.h

…

phy_common.c

…

phy_common.h

…

phy_g.c

…

phy_g.h

…

phy_lp.c

…

phy_lp.h

…

phy_n.c

…

phy_n.h

…

pio.c

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

2009-11-18 22:19:03 -08:00

pio.h

…

rfkill.c

b43: avoid PPC fault during resume

2009-12-04 13:28:49 -05:00

rfkill.h

…

sdio.c

…

sdio.h

…

sysfs.c

…

sysfs.h

…

tables_lpphy.c

…

tables_lpphy.h

…

tables_nphy.c

…

tables_nphy.h

…

tables.c

…

tables.h

…

wa.c

…

wa.h

…

xmit.c

b43: Remove deprecated 'qual' from returned RX status

2009-11-06 16:49:09 -05:00

xmit.h

b43: Rewrite TX bounce buffer handling

2009-11-11 15:23:40 -05:00