leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
e486463e82
linux/drivers/net/wireless/iwlwifi
History
David S. Miller e486463e82 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/usb/qmi_wwan.c
	net/batman-adv/translation-table.c
	net/ipv6/route.c

qmi_wwan.c resolution provided by Bjørn Mork.

batman-adv conflict is dealing merely with the changes
of global function names to have a proper subsystem
prefix.

ipv6's route.c conflict is merely two side-by-side additions
of network namespace methods.

Signed-off-by: David S. Miller <davem@davemloft.net>
2012-06-25 15:50:32 -07:00
..
dvm Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-06-25 15:50:32 -07:00
pcie Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem 2012-06-19 14:41:22 -04:00
iwl-agn-hw.h iwlwifi: move OTP defines 2012-04-23 14:30:01 -07:00
iwl-config.h iwlwifi: fix typo 'IWL_WATCHHDOG_DISABLED' 2012-06-06 13:24:36 +02:00
iwl-csr.h iwlwifi: configure the SKU in the HW 2012-06-06 13:22:30 +02:00
iwl-debug.c iwlwifi: implement dynamic opmode loading 2012-06-05 15:32:13 -04:00
iwl-debug.h iwlwifi: refactor EEPROM reading/parsing 2012-06-06 13:24:19 +02:00
iwl-devtrace.c iwlwifi: implement dynamic opmode loading 2012-06-05 15:32:13 -04:00
iwl-devtrace.h iwlwifi: move DVM code into subdirectory 2012-06-06 13:21:14 +02:00
iwl-drv.c iwlwifi: unlock on error path 2012-06-14 14:55:14 -04:00
iwl-drv.h iwlwifi: move driver defines to iwl-drv.h 2012-04-23 14:29:02 -07:00
iwl-eeprom-parse.c iwlwifi: refactor EEPROM reading/parsing 2012-06-06 13:24:19 +02:00
iwl-eeprom-parse.h iwlwifi: refactor EEPROM reading/parsing 2012-06-06 13:24:19 +02:00
iwl-eeprom-read.c iwlwifi: refactor EEPROM reading/parsing 2012-06-06 13:24:19 +02:00
iwl-eeprom-read.h iwlwifi: refactor EEPROM reading/parsing 2012-06-06 13:24:19 +02:00
iwl-fh.h iwlwifi: print more info when a queue is stuck 2012-06-13 09:01:02 +02:00
iwl-fw-file.h iwlwifi: remove uCode alternatives mechanism 2012-04-16 14:34:44 -07:00
iwl-fw.h iwlwifi: include net/mac80211.h to avoid compiler error 2012-04-23 14:21:53 -07:00
iwl-io.c iwlwifi: iwl_{read,write}_targ_mem_words takes dwords 2012-06-13 09:01:01 +02:00
iwl-io.h iwlwifi: iwl_{read,write}_targ_mem_words takes dwords 2012-06-13 09:01:01 +02:00
iwl-modparams.h iwlwifi: remove the iwl_shared reference 2012-05-08 21:53:44 -04:00
iwl-notif-wait.c iwlwifi: move notification wait into core 2012-06-05 15:32:14 -04:00
iwl-notif-wait.h
iwl-op-mode.h iwlwifi: remove extern opmode ops declarations 2012-06-06 13:26:00 +02:00
iwl-prph.h Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-06-12 21:59:18 -07:00
iwl-test.c iwlwifi: iwl_{read,write}_targ_mem_words takes dwords 2012-06-13 09:01:01 +02:00
iwl-test.h iwlwifi: decouple testmode and iwl-test 2012-06-11 11:41:18 +02:00
iwl-testmode.h iwlwifi: refactor testmode 2012-06-11 11:37:21 +02:00
iwl-trans.h iwlwifi: allocate Tx cmd pool per device 2012-06-06 13:21:22 +02:00
Kconfig iwlwifi: implement dynamic opmode loading 2012-06-05 15:32:13 -04:00
Makefile iwlwifi: Fix Makefile build order for built-in driver 2012-06-13 09:01:05 +02:00