John W. Linville 800f65bba8 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-next-2.6 ...

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-commands.h

2010-07-27 11:59:19 -04:00

..

ath

ath9k_hw: simplify noisefloor calibration chainmask calculation

2010-07-26 15:32:42 -04:00

b43

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

2010-07-27 11:59:19 -04:00

b43legacy

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

hostap

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

2010-07-20 18:25:24 -07:00

ipw2x00

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

2010-07-27 11:59:19 -04:00

iwlwifi

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

2010-07-27 11:59:19 -04:00

iwmc3200wifi

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

2010-07-01 17:34:14 -07:00

libertas

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

2010-07-27 11:59:19 -04:00

libertas_tf

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

2010-06-17 14:19:06 -07:00

orinoco

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

2010-07-27 11:59:19 -04:00

p54

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

2010-06-17 14:19:06 -07:00

prism54

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

rt2x00

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

2010-07-27 11:59:19 -04:00

rtl818x

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

2010-07-27 11:59:19 -04:00

wl12xx

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

2010-07-27 11:59:19 -04:00

zd1211rw

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

2010-06-17 14:19:06 -07:00

adm8211.c

adm8211: fix memory leak

2010-07-12 16:05:32 -04:00

adm8211.h

drivers/net: use __packed annotation

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

airo_cs.c

…

airo.c

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

2010-07-27 11:59:19 -04:00

airo.h

…

at76c50x-usb.c

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

2010-07-01 17:34:14 -07:00

at76c50x-usb.h

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

2010-07-01 17:34:14 -07:00

atmel_cs.c

…

atmel_pci.c

…

atmel.c

…

atmel.h

…

Kconfig

…

mac80211_hwsim.c

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

2010-07-01 17:34:14 -07:00

Makefile

…

mwl8k.c

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

2010-07-27 11:59:19 -04:00

ray_cs.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6

2010-05-20 21:04:44 -07:00

ray_cs.h

…

rayctl.h

…

rndis_wlan.c

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

2010-07-01 17:34:14 -07:00

wl3501_cs.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6

2010-05-20 21:04:44 -07:00

wl3501.h

drivers/net: use __packed annotation

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

zd1201.c

drivers/net: Remove unnecessary returns from void function()s

2010-05-14 00:19:28 -07:00

zd1201.h

…