黄涛 ea32bd9ebc Revert "uidstat: Adding uid stat driver to collect network statistics." ...

This reverts commit ab6c8fc0de.

Conflicts:

	drivers/misc/Kconfig

2011-07-30 22:57:02 +08:00

..

9p

Revert "Merge remote branch 'linux-2.6.32.y/master' into develop"

2011-07-30 16:24:52 +08:00

802

net: remove COMPAT_NET_DEV_OPS

2009-05-25 01:53:53 -07:00

8021q

vlan: Fix register_vlan_dev() error path

2009-11-17 06:45:04 -08:00

appletalk

Have atalk_route_packet() return NET_RX_SUCCESS not NET_XMIT_SUCCESS

2009-09-14 17:02:47 -07:00

atm

Revert "Merge remote-tracking branch 'linux-2.6.32.y/master' into develop"

2011-07-30 16:01:15 +08:00

ax25

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

2011-07-30 22:24:29 +08:00

bluetooth

Revert "Bluetooth: Do not attempt to send dlci disconnect when in BT_CONFIG."

2011-07-30 22:41:07 +08:00

bridge

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

2011-07-30 22:24:29 +08:00

can

Revert "Merge remote branch 'linux-2.6.32.y/master' into develop"

2011-07-30 16:24:52 +08:00

core

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

2011-07-30 22:24:29 +08:00

dcb

net: fix double skb free in dcbnl

2009-09-26 20:16:15 -07:00

dccp

Revert "Merge remote branch 'linux-2.6.32.y/master' into develop"

2011-07-30 16:24:52 +08:00

decnet

Revert "Merge remote branch 'linux-2.6.32.y/master' into develop"

2011-07-30 16:24:52 +08:00

dsa

netdev: convert pseudo-devices to netdev_tx_t

2009-09-01 01:13:07 -07:00

econet

Revert "Merge remote branch 'linux-2.6.32.y/master' into develop"

2011-07-30 16:24:52 +08:00

ethernet

net: remove COMPAT_NET_DEV_OPS

2009-05-25 01:53:53 -07:00

ieee802154

net: Make setsockopt() optlen be unsigned.

2009-09-30 16:12:20 -07:00

ipv4

Revert "net: Replace AID_NET_RAW checks with capable(CAP_NET_RAW)."

2011-07-30 22:44:42 +08:00

ipv6

Revert "net: Replace AID_NET_RAW checks with capable(CAP_NET_RAW)."

2011-07-30 22:44:42 +08:00

ipx

net: Make setsockopt() optlen be unsigned.

2009-09-30 16:12:20 -07:00

irda

Revert "Merge remote branch 'linux-2.6.32.y/master' into develop"

2011-07-30 16:24:52 +08:00

iucv

net: Make setsockopt() optlen be unsigned.

2009-09-30 16:12:20 -07:00

key

net: file_operations should be const

2009-09-02 01:03:53 -07:00

lapb

net: remove NET_RX_BAD and NET_RX_CN* defines

2009-07-05 19:15:35 -07:00

llc

Revert "Merge remote branch 'linux-2.6.32.y/master' into develop"

2011-07-30 16:24:52 +08:00

mac80211

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

2011-07-30 22:24:29 +08:00

netfilter

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

2011-07-30 22:24:29 +08:00

netlabel

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2009-07-30 19:22:43 -07:00

netlink

Revert "Merge remote branch 'linux-2.6.32.y/master' into develop"

2011-07-30 16:24:52 +08:00

netrom

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

2011-07-30 22:24:29 +08:00

packet

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

2011-07-30 22:24:29 +08:00

phonet

Revert "Merge remote branch 'linux-2.6.32.y/master' into develop"

2011-07-30 16:24:52 +08:00

rds

Revert "Merge remote branch 'linux-2.6.32.y/master' into develop"

2011-07-30 16:24:52 +08:00

rfkill

Revert "rfkill: Introduce CONFIG_RFKILL_PM and use instead of CONFIG_PM to power down"

2011-07-30 22:41:11 +08:00

rose

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

2011-07-30 22:24:29 +08:00

rxrpc

net: Make setsockopt() optlen be unsigned.

2009-09-30 16:12:20 -07:00

sched

Revert "Merge remote branch 'linux-2.6.32.y/master' into develop"

2011-07-30 16:24:52 +08:00

sctp

Revert "Merge remote branch 'linux-2.6.32.y/master' into develop"

2011-07-30 16:24:52 +08:00

sunrpc

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

2011-07-30 22:24:29 +08:00

tipc

Revert "Merge remote branch 'linux-2.6.32.y/master' into develop"

2011-07-30 16:24:52 +08:00

unix

Revert "Merge remote branch 'linux-2.6.32.y/master' into develop"

2011-07-30 16:24:52 +08:00

wanrouter

headers: smp_lock.h redux

2009-07-12 12:22:34 -07:00

wimax

wimax: fix warning caused by not checking retval of rfkill_set_hw_state()

2009-06-11 11:12:48 -07:00

wireless

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

2011-07-30 22:24:29 +08:00

x25

Revert "Merge remote branch 'linux-2.6.32.y/master' into develop"

2011-07-30 16:24:52 +08:00

xfrm

net: file_operations should be const

2009-09-02 01:03:53 -07:00

compat.c

Revert "Merge remote branch 'linux-2.6.32.y/master' into develop"

2011-07-30 16:24:52 +08:00

Kconfig

Paranoid network.

2010-02-08 15:07:32 -08:00

Makefile

net: remove redundant sched/ in net/Makefile

2009-07-12 20:11:14 -07:00

nonet.c

[PATCH] Make most file operations structs in fs/ const

2006-03-28 09:16:06 -08:00

socket.c

Revert "uidstat: Adding uid stat driver to collect network statistics."

2011-07-30 22:57:02 +08:00

sysctl_net.c

net: sysctl_net - use net_eq to compare nets

2009-03-16 16:23:30 +01:00

TUNABLE

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00