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

..

ipw2100.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

ipw2100.h

drivers/net: use __packed annotation

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

ipw2200.c

ipw2200: Enable LED by default

2010-06-16 14:58:57 -04:00

ipw2200.h

drivers/net: use __packed annotation

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

Kconfig

wireless: remove WLAN_80211 and WLAN_PRE80211 from Kconfig

2009-10-30 16:50:35 -04:00

libipw_geo.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

libipw_module.c

libipw: correct sparse warnings and mark some variables static

2010-07-20 16:49:40 -04:00

libipw_rx.c

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

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

libipw_tx.c

lib80211: remove unused host_build_iv option

2010-07-26 15:09:04 -04:00

libipw_wx.c

lib80211: remove unused host_build_iv option

2010-07-26 15:09:04 -04:00

libipw.h

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

Makefile

…