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

Conflicts:

	drivers/net/wireless/rt2x00/Kconfig
	drivers/net/wireless/rt2x00/rt2x00usb.c
	net/sctp/protocol.c

2008-06-16 18:25:48 -07:00

..

Kconfig

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

2008-06-16 18:25:48 -07:00

Makefile

…

rt2x00.h

rt2x00: Centralize RX packet alignment handling in rt2x00lib.

2008-06-14 12:17:57 -04:00

rt2x00config.c

rt2x00: Reset antenna RSSI after switch

2008-05-28 16:43:45 -04:00

rt2x00debug.c

rt2x00: Cleanup struct skb_frame_desc.

2008-06-14 12:17:56 -04:00

rt2x00debug.h

…

rt2x00dev.c

rt2x00: Rework alignment check.

2008-06-14 12:17:59 -04:00

rt2x00dump.h

…

rt2x00firmware.c

…

rt2x00leds.c

rt2x00: Fix quality/activity led handling

2008-05-01 17:38:39 -04:00

rt2x00leds.h

rt2x00: Remove MAC80211_LEDS dependency

2008-04-01 17:14:09 -04:00

rt2x00lib.h

rt2x00: Move generic TX frame writing code into rt2x00queue

2008-06-14 12:17:56 -04:00

rt2x00mac.c

rt2x00: Clear IEEE80211_TX_CTL_USE_RTS_CTS flag for RTS frame

2008-06-14 12:17:57 -04:00

rt2x00pci.c

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

2008-06-16 18:25:48 -07:00

rt2x00pci.h

rt2x00: Move generic TX frame writing code into rt2x00queue

2008-06-14 12:17:56 -04:00

rt2x00queue.c

mac80211: remove ieee80211_get_morefrag

2008-06-14 12:18:12 -04:00

rt2x00queue.h

rt2x00: Cleanup struct skb_frame_desc.

2008-06-14 12:17:56 -04:00

rt2x00reg.h

rt2x00: Use __builtin_choose_expr() instead of ?:

2008-06-14 12:17:57 -04:00

rt2x00rfkill.c

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

2008-03-18 00:37:55 -07:00

rt2x00usb.c

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

2008-06-16 18:25:48 -07:00

rt2x00usb.h

rt2x00: Move generic TX frame writing code into rt2x00queue

2008-06-14 12:17:56 -04:00

rt61pci.c

rt2x00: Cleanup struct skb_frame_desc.

2008-06-14 12:17:56 -04:00

rt61pci.h

rt2x00: Remove unused defines

2008-06-14 12:17:58 -04:00

rt73usb.c

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

2008-06-16 18:25:48 -07:00

rt73usb.h

rt2x00: Remove unused defines

2008-06-14 12:17:58 -04:00

rt2400pci.c

rt2x00: Cleanup struct skb_frame_desc.

2008-06-14 12:17:56 -04:00

rt2400pci.h

rt2x00: Remove unused defines

2008-06-14 12:17:58 -04:00

rt2500pci.c

rt2x00: Cleanup struct skb_frame_desc.

2008-06-14 12:17:56 -04:00

rt2500pci.h

rt2x00: Remove unused defines

2008-06-14 12:17:58 -04:00

rt2500usb.c

rt2x00: Fix double usage of skb->cb in USB RX path.

2008-06-14 12:17:57 -04:00

rt2500usb.h

rt2x00: Remove unused defines

2008-06-14 12:17:58 -04:00