]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a108d5f 4d634ca)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Tue, 24 Apr 2012 03:14:36 +0000 (23:14 -0400)
committerDavid S. Miller <davem@davemloft.net>
Tue, 24 Apr 2012 03:15:17 +0000 (23:15 -0400)
commitf24001941c99776f41bd3f09c07d91205c2ad9d4
tree0ab31480ccdf343b61db045e195d096068ef7c73tree | snapshot
parenta108d5f35adc5c5d5cdc882dc0bb920565551bffcommit | diff
parent4d634ca35a8b38530b134ae92bc9e3cc9c23c030commit | diff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Fix merge between commit 3adadc08cc1e ("net ax25: Reorder ax25_exit to
remove races") and commit 0ca7a4c87d27 ("net ax25: Simplify and
cleanup the ax25 sysctl handling")

The former moved around the sysctl register/unregister calls, the
later simply removed them.

With help from Stephen Rothwell.

Signed-off-by: David S. Miller <davem@davemloft.net>
15 files changed:
MAINTAINERS diff1 | diff2 | blob | history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/smsc/smsc911x.c diff1 | diff2 | blob | history
drivers/net/hyperv/netvsc_drv.c diff1 | diff2 | blob | history
drivers/net/wireless/ath/ath9k/main.c diff1 | diff2 | blob | history
include/net/sock.h diff1 | diff2 | blob | history
net/ax25/af_ax25.c diff1 | diff2 | blob | history
net/ipv4/tcp_input.c diff1 | diff2 | blob | history
net/ipv4/tcp_output.c diff1 | diff2 | blob | history
net/ipv6/tcp_ipv6.c diff1 | diff2 | blob | history
net/mac80211/ibss.c diff1 | diff2 | blob | history
net/mac80211/rx.c diff1 | diff2 | blob | history
net/sched/sch_gred.c diff1 | diff2 | blob | history
net/wireless/util.c diff1 | diff2 | blob | history
Linux kernel for KaRo TX COM modules