黄涛 21158e22d9 Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0 ...

Conflicts:
	Makefile
	drivers/mmc/core/sd.c
	drivers/net/usb/asix.c
	drivers/net/wireless/ath/ath9k/recv.c
	drivers/net/wireless/b43legacy/main.c
	drivers/net/wireless/p54/p54usb.c
	drivers/net/wireless/rt2x00/rt2400pci.c
	drivers/net/wireless/rt2x00/rt2400pci.h
	drivers/net/wireless/rt2x00/rt2500pci.c
	drivers/net/wireless/rt2x00/rt2500usb.c
	drivers/net/wireless/rt2x00/rt2500usb.h
	drivers/net/wireless/rt2x00/rt2800pci.c
	drivers/net/wireless/rt2x00/rt2800usb.c
	drivers/net/wireless/rt2x00/rt61pci.c
	drivers/net/wireless/rt2x00/rt61pci.h
	drivers/net/wireless/rt2x00/rt73usb.c
	drivers/net/wireless/rt2x00/rt73usb.h
	drivers/net/wireless/rtl818x/rtl8187/dev.c
	drivers/usb/serial/option.c
	kernel/time/timekeeping.c

2012-10-08 10:28:29 +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

Revert "net: maintain namespace isolation between vlan and real device"

2012-06-10 00:33:03 +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

Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0

2012-10-08 10:28:29 +08:00

bridge

Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0-jb

2012-07-18 11:12:45 +08:00

caif

caif: Fix access to freed pernet memory

2012-08-09 08:27:51 -07:00

can

can bcm: fix incomplete tx_setup fix

2011-11-11 09:36:45 -08:00

ceph

ceph: fix file mode calculation

2011-07-19 11:25:04 -07:00

core

drop_monitor: dont sleep in atomic context

2012-10-02 09:47:42 -07: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-10-08 10:28:29 +08:00

ipv6

Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0

2012-10-08 10:28:29 +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: avoid to use synchronize_rcu in tunnel free function

2012-10-02 09:47:22 -07:00

lapb

Net: lapb: Makefile: Remove deprecated kbuild goal definitions

2010-11-22 08:16:14 -08:00

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-jb

2012-08-21 13:11:48 +08:00

netfilter

Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0

2012-10-08 10:28:29 +08:00

netlabel

Remove prefetch() from <linux/skbuff.h> and "netlabel_addrlist.h"

2011-05-22 21:43:41 -07:00

netlink

netlink: fix possible spoofing from non-root processes

2012-10-02 09:47:22 -07:00

netrom

Revert "Merge commit 'v2.6.32.9' into android-2.6.32"

2011-07-30 22:24:29 +08: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: set correct msg_namelen

2012-10-02 09:47:41 -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

net_sched: gact: Fix potential panic in tcf_gact().

2012-10-02 09:47:05 -07:00

sctp

sctp: Fix list corruption resulting from freeing an association on a list

2012-08-09 08:27:51 -07:00

sunrpc

svcrpc: sends on closed socket should stop immediately

2012-09-14 10:00:39 -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

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6

2010-05-20 21:04:44 -07:00

wireless

Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0

2012-10-08 10:28:29 +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 develop-3.0-jb

2012-07-12 18:46:41 +08: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

llseek: automatically add .llseek fop

2010-10-15 15:53:27 +02:00

socket.c

net: fix info leak in compat dev_ifconf()

2012-10-02 09:47:22 -07:00

sysctl_net.c

net: Remove unnecessary returns from void function()s

2010-05-17 23:23:14 -07:00

TUNABLE

…