]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ca74482 826b34d)
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)
commit2a956aec2a2d0a747203163d5964d48a4cea76be
treed125270f4e8432cebcbc8af9079dece51dd798a0tree | snapshot
parentca74482354a7ad6f02726828e0dab182f6ff72e6commit | diff
parent826b34d51cf5e3b3ffa53dbf86b541e49e5c1c8dcommit | 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
Linux Kernel Source Tree.