shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 20:07:46 +09:00
Code Issues Packages Projects Releases Wiki Activity
Files
9e329ef41d6afa8b0ff21929d5f170e67fe38a59
linux/net
History
黄涛 2b57125c3d Merge remote-tracking branch 'aosp/android-3.0' into develop-3.0 
Conflicts:
	drivers/net/wireless/bcmdhd/Makefile
	drivers/net/wireless/bcmdhd/bcmsdh.c
	drivers/net/wireless/bcmdhd/bcmsdh_linux.c
	drivers/net/wireless/bcmdhd/bcmsdh_sdmmc.c
	drivers/net/wireless/bcmdhd/bcmsdh_sdmmc_linux.c
	drivers/net/wireless/bcmdhd/dhd.h
	drivers/net/wireless/bcmdhd/dhd_cfg80211.c
	drivers/net/wireless/bcmdhd/dhd_custom_gpio.c
	drivers/net/wireless/bcmdhd/dhd_linux.c
	drivers/net/wireless/bcmdhd/dhd_sdio.c
	drivers/net/wireless/bcmdhd/include/bcmutils.h
	drivers/net/wireless/bcmdhd/include/epivers.h
	drivers/net/wireless/bcmdhd/include/sbchipc.h
	drivers/net/wireless/bcmdhd/include/sdioh.h
	drivers/net/wireless/bcmdhd/include/wlioctl.h
	drivers/net/wireless/bcmdhd/wl_android.c
	drivers/net/wireless/bcmdhd/wl_cfg80211.c
	drivers/net/wireless/bcmdhd/wl_cfg80211.h
	drivers/net/wireless/bcmdhd/wl_cfgp2p.c
	drivers/net/wireless/bcmdhd/wl_cfgp2p.h
	drivers/net/wireless/bcmdhd/wldev_common.c
2012-12-18 16:25:10 +08:00
..
9p
net/9p: Fix kernel crash with msize 512K
2011-10-03 11:40:22 -07:00
802
snap: remove one synchronize_net()
2011-05-23 16:29:24 -04:00
8021q
8021q: fix mac_len recomputation in vlan_untag()
2012-10-13 05:28:06 +09:00
appletalk
appletalk: Fix OOPS in atalk_release().
2011-03-31 18:59:10 -07:00
atm
atm: fix info leak via getsockname()
2012-10-02 09:47:06 -07:00
ax25
net ax25: Reorder ax25_exit to remove races.
2012-04-27 09:51:21 -07:00
batman-adv
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
2011-05-20 13:43:21 -07:00
bluetooth
wifi: support mt5931 wifi and mt6622 bt
2012-11-28 17:10:22 +08:00
bridge
Merge remote-tracking branch 'stable/linux-3.0.y' into android-3.0
2012-11-01 13:36:34 -07:00
caif
caif: Fix access to freed pernet memory
2012-08-09 08:27:51 -07:00
can
can: bcm: initialize ifindex for timeouts without previous frame reception
2012-12-03 12:59:14 -08:00
ceph
ceph: fix file mode calculation
2011-07-19 11:25:04 -07:00
core
net-rps: Fix brokeness causing OOO packets
2012-11-26 11:34:36 -08:00
dcb
net: dcbnl: Update copyright dates
2011-03-14 17:02:42 -07:00
dccp
dccp: fix info leak via getsockopt(DCCP_SOCKOPT_CCID_TX_INFO)
2012-10-02 09:47:21 -07:00
decnet
net: fix NULL dereferences in check_peer_redir()
2012-02-13 11:06:13 -08:00
dns_resolver
KEYS: Improve /proc/keys
2011-03-17 11:59:32 +11:00
dsa
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2011-05-05 14:59:02 -07:00
econet
revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36
2011-10-28 16:02:47 +08:00
ethernet
net: add IFF_SKB_TX_SHARED flag to priv_flags
2011-08-15 18:31:38 -07:00
ieee802154
ieee802154: Don't leak memory in ieee802154_nl_fill_phy
2011-06-13 18:03:22 -04:00
ipv4
Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0
2012-12-12 17:18:39 +08:00
ipv6
Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0
2012-12-01 12:07:55 +08:00
ipx
ipx: fix ipx_release()
2011-03-21 18:16:39 -07:00
irda
revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36
2011-10-28 16:02:47 +08:00
iucv
[S390] irq: merge irq.c and s390_ext.c
2011-05-26 09:48:24 +02:00
key
net: convert %p usage to %pK
2011-05-24 01:13:12 -04:00
l2tp
l2tp: fix oops in l2tp_eth_create() error path
2012-11-17 13:14:25 -08:00
lapb
…
llc
llc: fix info leak via getsockname()
2012-10-02 09:47:21 -07:00
mac80211
Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0
2012-12-12 17:18:39 +08:00
netfilter
Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0
2012-12-01 12:07:55 +08:00
netlabel
Remove prefetch() from <linux/skbuff.h> and "netlabel_addrlist.h"
2011-05-22 21:43:41 -07:00
netlink
netlink: use kfree_rcu() in netlink_release()
2012-11-17 13:14:23 -08:00
netrom
netrom: copy_datagram_iovec can fail
2012-10-13 05:28:08 +09:00
packet
af_packet: remove BUG statement in tpacket_destruct_skb
2012-10-02 09:47:05 -07:00
phonet
phonet: Check input from user before allocating
2012-04-27 09:51:19 -07:00
rds
RDS: fix rds-ping spinlock recursion
2012-10-28 10:02:13 -07:00
rfkill
BT: for NH660
2012-08-06 15:19:18 +08:00
rose
rose_dev: fix memcpy-bug in rose_set_mac_address
2012-04-13 08:14:05 -07:00
rxrpc
rxrpc: Fix set but unused variable 'usage' in rxrpc_get_transport()
2011-05-19 18:51:50 -04:00
sched
pkt_sched: fix virtual-start-time update in QFQ
2012-10-13 05:28:06 +09:00
sctp
sctp: fix call to SCTP_CMD_PROCESS_SACK in sctp_cmd_interpreter()
2012-11-17 13:14:23 -08:00
sunrpc
SUNRPC: Prevent races in xs_abort_connection()
2012-10-31 09:51:34 -07:00
tipc
Revert "Merge remote branch 'linux-2.6.32.y/master' into develop"
2011-07-30 16:24:52 +08:00
unix
revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36
2011-10-28 16:02:47 +08:00
wanrouter
wanmain: comparing array with NULL
2012-08-09 08:27:52 -07:00
wimax
…
wireless
Merge remote-tracking branch 'aosp/android-3.0' into develop-3.0
2012-12-18 16:25:10 +08:00
x25
revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36
2011-10-28 16:02:47 +08:00
xfrm
Merge remote-tracking branch 'stable/linux-3.0.y' into android-3.0
2012-11-01 13:36:34 -07:00
activity_stats.c
revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36
2011-10-28 16:02:47 +08:00
compat.c
revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36
2011-10-28 16:02:47 +08:00
Kconfig
revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36
2011-10-28 16:02:47 +08:00
Makefile
revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36
2011-10-28 16:02:47 +08:00
nonet.c
…
socket.c
net: fix info leak in compat dev_ifconf()
2012-10-02 09:47:22 -07:00
sysctl_net.c
…
TUNABLE
…