]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commit
projects / mirror_ubuntu-artful-kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b3e3bd7 194d983)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Sun, 25 Nov 2012 17:49:17 +0000 (12:49 -0500)
committerDavid S. Miller <davem@davemloft.net>
Sun, 25 Nov 2012 17:49:17 +0000 (12:49 -0500)
commit24bc518a6888e4c97add5a5ebbff11c1ccac219f
treed125270f4e8432cebcbc8af9079dece51dd798a0tree
parentb3e3bd71b429c04490d6a57671f2bbe2121d4f5acommit | diff
parent194d9831f0419b5125dc94ec0ece4434d8ef74f0commit | diff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

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>
MAINTAINERS diff1 | diff2 | blob | history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c diff1 | diff2 | blob | history
drivers/net/wireless/ath/ath9k/hw.c diff1 | diff2 | blob | history
drivers/net/wireless/mwifiex/cmdevt.c diff1 | diff2 | blob | history
drivers/nfc/pn533.c diff1 | diff2 | blob | history
net/core/net-sysfs.c diff1 | diff2 | blob | history
net/ipv4/route.c diff1 | diff2 | blob | history
net/mac80211/ibss.c diff1 | diff2 | blob | history
net/nfc/llcp/llcp.c diff1 | diff2 | blob | history
Ubuntu Artful kernel mirror