UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity
OpenCloudOS-Kernel/net
History
David S. Miller 8decf86879 Merge branch 'master' of github.com:davem330/net 
Conflicts:
	MAINTAINERS
	drivers/net/Kconfig
	drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
	drivers/net/ethernet/broadcom/tg3.c
	drivers/net/wireless/iwlwifi/iwl-pci.c
	drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c
	drivers/net/wireless/rt2x00/rt2800usb.c
	drivers/net/wireless/wl12xx/main.c
 		2011-09-22 03:23:13 -04:00
..
9p net/9p: Fix kernel crash with msize 512K 2011-09-06 08:17:15 -05:00
802 rcu: convert uses of rcu_assign_pointer(x, NULL) to RCU_INIT_POINTER 2011-08-02 04:29:23 -07:00
8021q net: consolidate and fix ethtool_ops->get_settings calling 2011-09-15 17:32:26 -04:00
appletalk appletalk: Reduce switch/case indent 2011-07-01 16:11:15 -07:00
atm Merge branch 'master' of github.com:davem330/net 2011-09-22 03:23:13 -04:00
ax25 ax25: Fix set-but-unused variable. 2011-04-17 00:48:31 -07:00
batman-adv batman-adv: Remove unnecessary OOM logging messages 2011-09-08 17:52:30 +02:00
bluetooth Merge branch 'master' of github.com:davem330/net 2011-09-22 03:23:13 -04:00
bridge Merge branch 'master' of github.com:davem330/net 2011-09-22 03:23:13 -04:00
caif Merge branch 'master' of github.com:davem330/net 2011-09-22 03:23:13 -04:00
can Merge branch 'master' of github.com:davem330/net 2011-09-22 03:23:13 -04:00
ceph Merge branch 'for-linus' of git://ceph.newdream.net/git/ceph-client 2011-09-09 15:48:34 -07:00
core Merge branch 'master' of github.com:davem330/net 2011-09-22 03:23:13 -04:00
dcb dcbnl: unlock on an error path in dcbnl_cee_fill() 2011-07-08 09:01:14 -07:00
dccp Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net 2011-08-07 23:20:26 -07:00
decnet rcu: convert uses of rcu_assign_pointer(x, NULL) to RCU_INIT_POINTER 2011-08-02 04:29:23 -07:00
dns_resolver KEYS: Improve /proc/keys 2011-03-17 11:59:32 +11:00
dsa net: remove use of ndo_set_multicast_list in drivers 2011-08-17 20:22:03 -07:00
econet af_econet: Use current logging styles and neatening 2011-07-03 20:05:16 -07:00
ethernet net: don't clear IFF_XMIT_DST_RELEASE in ether_setup 2011-09-15 14:49:44 -04:00
ieee802154 6LoWPAN: fix skb_copy call 2011-09-15 15:36:35 -04:00
ipv4 Merge branch 'master' of github.com:davem330/net 2011-09-22 03:23:13 -04:00
ipv6 Merge branch 'master' of github.com:davem330/net 2011-09-22 03:23:13 -04:00
ipx ipx: fix ipx_release() 2011-03-21 18:16:39 -07:00
irda Merge branch 'master' of github.com:davem330/net 2011-09-22 03:23:13 -04:00
iucv af_iucv: add HiperSockets transport 2011-08-13 01:10:16 -07:00
key net: Remove casts of void * 2011-06-16 23:19:27 -04:00
l2tp Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2011-07-28 05:58:19 -07:00
lapb wan: make LAPB callbacks const 2011-09-16 19:20:20 -04:00
llc llc: Fix length check in llc_fixup_skb(). 2011-04-11 18:59:05 -07:00
mac80211 Merge branch 'master' of github.com:davem330/net 2011-09-22 03:23:13 -04:00
netfilter Merge branch 'master' of github.com:davem330/net 2011-09-22 03:23:13 -04:00
netlabel Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net 2011-08-20 10:39:12 -07:00
netlink net: cleanup some rcu_dereference_raw 2011-08-12 02:55:28 -07:00
netrom netrom: Reduce switch/case indent 2011-07-01 16:11:16 -07:00
nfc NFC: Reserve tx head and tail room 2011-08-24 14:41:44 -04:00
packet net: consolidate and fix ethtool_ops->get_settings calling 2011-09-15 17:32:26 -04:00
phonet rcu: convert uses of rcu_assign_pointer(x, NULL) to RCU_INIT_POINTER 2011-08-02 04:29:23 -07:00
rds net, rds, Replace xlist in net/rds/xlist.h with llist 2011-09-15 15:36:32 -04:00
rfkill rfkill: Remove unnecessary OOM logging messages 2011-09-13 15:45:02 -04:00
rose rose: Delete commented out references to ancient firewalling code. 2011-07-07 02:41:59 -07:00
rxrpc rxrpc: Fix set but unused variable 'usage' in rxrpc_get_transport() 2011-05-19 18:51:50 -04:00
sched Merge branch 'master' of github.com:davem330/net 2011-09-22 03:23:13 -04:00
sctp Merge branch 'master' of github.com:davem330/net 2011-09-22 03:23:13 -04:00
sunrpc rcu: convert uses of rcu_assign_pointer(x, NULL) to RCU_INIT_POINTER 2011-08-02 04:29:23 -07:00
tipc tipc: Remove unused link event tracking code 2011-09-17 22:55:15 -04:00
unix Revert "Scm: Remove unnecessary pid & credential references in Unix socket's send and receive path" 2011-09-16 19:34:00 -04:00
wanrouter Fix common misspellings 2011-03-31 11:26:23 -03:00
wimax
…
wireless Merge branch 'master' of github.com:davem330/net 2011-09-22 03:23:13 -04:00
x25 x25: Reduce switch/case indent 2011-07-01 16:11:16 -07:00
xfrm Merge branch 'master' of github.com:davem330/net 2011-09-22 03:23:13 -04:00
Kconfig NFC: add nfc subsystem core 2011-07-05 15:26:57 -04:00
Makefile NFC: add nfc subsystem core 2011-07-05 15:26:57 -04:00
compat.c net: Add sendmmsg socket system call 2011-05-05 11:10:14 -07:00
nonet.c
…
socket.c Merge branch 'master' of github.com:davem330/net 2011-09-22 03:23:13 -04:00
sysctl_net.c
…