John W. Linville 515db09338 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux ...

Conflicts:
	drivers/net/wireless/iwlegacy/iwl-debugfs.c
	drivers/net/wireless/iwlegacy/iwl-rx.c
	drivers/net/wireless/iwlegacy/iwl-scan.c
	drivers/net/wireless/iwlegacy/iwl-tx.c
	include/net/bluetooth/bluetooth.h

2011-11-22 14:05:46 -05:00

..

carl9170.h

carl9170: export HW random number generator

2011-08-24 14:41:42 -04:00

cmd.c

carl9170: Use do_div for 64-bit division to fix 32-bit kernels

2011-08-26 10:47:58 -04:00

cmd.h

carl9170: improve site survey

2011-08-24 14:41:42 -04:00

debug.c

carl9170: fix formatting issues found by checkpatch

2011-07-15 13:38:34 -04:00

debug.h

carl9170: firmware parser and debugfs code

2010-09-14 16:03:42 -04:00

eeprom.h

…

fw.c

drivers/net: Add module.h to drivers who were implicitly using it

2011-10-31 19:31:07 -04:00

fwcmd.h

carl9170: import updated firmware headers

2011-08-24 14:41:42 -04:00

fwdesc.h

carl9170 firmware: update firmware headers

2011-07-18 14:29:43 -04:00

hw.h

carl9170 firmware: update firmware headers

2011-07-18 14:29:43 -04:00

Kconfig

carl9170: export HW random number generator

2011-08-24 14:41:42 -04:00

led.c

carl9170: fix formatting issues found by checkpatch

2011-07-15 13:38:34 -04:00

mac.c

carl9170: move beacon_update into tx.c

2011-07-18 14:29:43 -04:00

main.c

ath: remove ath_regulatory::current_rd_ext

2011-10-11 16:41:27 -04:00

Makefile

carl9170: Makefile, Kconfig files and MAINTAINERS

2010-09-14 16:03:42 -04:00

phy.c

carl9170: improve site survey

2011-08-24 14:41:42 -04:00

phy.h

carl9170: import hw/fw header updates

2010-11-15 13:25:29 -05:00

rx.c

wireless: unify QoS control field definitions

2011-06-27 15:09:39 -04:00

tx.c

carl9170: use ieee80211_free_txskb

2011-11-21 16:22:10 -05:00

usb.c

carl9170: add NEC WL300NU-AG usbid

2011-07-05 14:42:37 -04:00

version.h

carl9170: import updated firmware headers

2011-08-24 14:41:42 -04:00

wlan.h

carl9170: import 1.9.4 firmware headers

2011-07-05 15:26:51 -04:00