Conflicts: drivers/net/wireless/iwlwifi/pcie/tx.c Minor iwlwifi conflict in TX queue disabling between 'net', which removed a bogus warning, and 'net-next' which added some status register poking code. Signed-off-by: David S. Miller <davem@davemloft.net> |
||
---|---|---|
.. | ||
boot | ||
include | ||
kernel | ||
lib | ||
math-emu | ||
mm | ||
oprofile | ||
Kconfig | ||
Kconfig.debug | ||
Makefile | ||
defconfig |