黄涛 35b9b535e7 Revert "Merge remote branch 'linux-2.6.32.y/master' into develop" ...

This reverts commit 6e2688ca84, reversing
changes made to 4b7c9de4de.

Conflicts:

	drivers/gpio/wm831x-gpio.c
	drivers/i2c/busses/Kconfig
	drivers/net/dm9000.c
	drivers/net/wireless/airo.c
	drivers/net/wireless/ath/ar9170/hw.h
	drivers/net/wireless/ath/ar9170/main.c
	drivers/net/wireless/ath/ar9170/usb.c
	drivers/net/wireless/ath/ath5k/ath5k.h
	drivers/net/wireless/ath/ath5k/attach.c
	drivers/net/wireless/ath/ath5k/base.c
	drivers/net/wireless/ath/ath5k/qcu.c
	drivers/net/wireless/ath/ath5k/reset.c
	drivers/net/wireless/ath/ath9k/ath9k.h
	drivers/net/wireless/ath/ath9k/beacon.c
	drivers/net/wireless/ath/ath9k/eeprom.h
	drivers/net/wireless/ath/ath9k/eeprom_def.c
	drivers/net/wireless/ath/ath9k/hw.c
	drivers/net/wireless/ath/ath9k/hw.h
	drivers/net/wireless/ath/ath9k/initvals.h
	drivers/net/wireless/ath/ath9k/main.c
	drivers/net/wireless/ath/ath9k/pci.c
	drivers/net/wireless/ath/ath9k/phy.h
	drivers/net/wireless/ath/ath9k/rc.c
	drivers/net/wireless/ath/ath9k/xmit.c
	drivers/net/wireless/ath/regd.h
	drivers/net/wireless/b43/Kconfig
	drivers/net/wireless/b43/Makefile
	drivers/net/wireless/b43/b43.h
	drivers/net/wireless/b43/dma.c
	drivers/net/wireless/b43/main.c
	drivers/net/wireless/b43/pio.c
	drivers/net/wireless/b43/pio.h
	drivers/net/wireless/b43/xmit.c
	drivers/net/wireless/b43legacy/main.c
	drivers/net/wireless/hostap/hostap_cs.c
	drivers/net/wireless/hostap/hostap_hw.c
	drivers/net/wireless/hostap/hostap_pci.c
	drivers/net/wireless/hostap/hostap_wlan.h
	drivers/net/wireless/iwlwifi/iwl-3945.c
	drivers/net/wireless/iwlwifi/iwl-4965.c
	drivers/net/wireless/iwlwifi/iwl-5000.c
	drivers/net/wireless/iwlwifi/iwl-agn-rs.c
	drivers/net/wireless/iwlwifi/iwl-agn.c
	drivers/net/wireless/iwlwifi/iwl-core.c
	drivers/net/wireless/iwlwifi/iwl-core.h
	drivers/net/wireless/iwlwifi/iwl-dev.h
	drivers/net/wireless/iwlwifi/iwl-helpers.h
	drivers/net/wireless/iwlwifi/iwl-rx.c
	drivers/net/wireless/iwlwifi/iwl-scan.c
	drivers/net/wireless/iwlwifi/iwl-tx.c
	drivers/net/wireless/iwlwifi/iwl3945-base.c
	drivers/net/wireless/libertas/if_sdio1.c
	drivers/net/wireless/p54/eeprom.c
	drivers/net/wireless/p54/p54pci.c
	drivers/net/wireless/p54/p54usb.c
	drivers/net/wireless/p54/txrx.c
	drivers/net/wireless/rndis_wlan.c
	drivers/net/wireless/rtl818x/rtl8180_dev.c
	drivers/net/wireless/wl12xx/wl1251_debugfs.c
	drivers/net/wireless/wl12xx/wl1251_sdio.c
	drivers/usb/serial/option.c
	net/bluetooth/rfcomm/core.c

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

..

9p

9p: fix readdir corner cases

2009-11-02 08:43:45 -06:00

bluetooth

Bluetooth: Use non-flushable pb flag by default for ACL data on capable chipsets.

2010-03-09 12:09:56 -08:00

irda

net: mark read-only arrays as const

2009-08-05 10:42:58 -07:00

iucv

af_iucv: Return -EAGAIN if iucv msg limit is exceeded

2009-06-19 00:10:40 -07:00

netfilter

ipv6: reassembly: use seperate reassembly queues for conntrack and local delivery

2010-01-06 15:04:39 -08:00

netns

netfilter: nf_conntrack: fix hash resizing with namespaces

2010-02-23 07:37:53 -08:00

phonet

Phonet: sockets list through proc_fs

2009-07-23 17:58:19 -07:00

sctp

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

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

tc_act

pkt_action: add new action skbedit

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

tipc

tipc: Remove unneeded parameter to tipc_createport_raw()

2008-07-14 22:42:19 -07:00

act_api.h

net: restore gnet_stats_basic to previous definition

2009-08-17 21:33:49 -07:00

addrconf.h

bonding: remap muticast addresses without using dev_close() and dev_open()

2009-09-15 02:37:40 -07:00

af_ieee802154.h

af_ieee802154: add support for WANT_ACK socket option

2009-08-12 21:54:50 -07:00

af_rxrpc.h

[AF_RXRPC]: Add an interface to the AF_RXRPC module for the AFS filesystem to use

2007-04-26 15:50:17 -07:00

af_unix.h

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

2011-07-30 16:09:59 +08:00

ah.h

[IPSEC]: Get rid of ipv6_{auth,esp,comp}_hdr

2007-10-10 16:55:55 -07:00

arp.h

net: make neigh_ops constant

2009-09-01 17:40:57 -07:00

atmclip.h

clip: convert to internal network_device_stats

2009-01-21 14:01:59 -08:00

ax25.h

[AX25] ax25_ds_timer: use mod_timer instead of add_timer

2008-02-12 17:53:34 -08:00

ax88796.h

ax88796: Add method to take MAC from platform data

2009-03-24 23:32:03 -07:00

cfg80211.h

cfg80211: fix dangling scan request checking

2009-08-20 11:36:05 -04:00

checksum.h

include/net net/ - csum_partial - remove unnecessary casts

2008-11-19 15:44:53 -08:00

cipso_ipv4.h

netlabel: Label incoming TCP connections correctly in SELinux

2009-03-28 15:01:36 +11:00

compat.h

net: Make setsockopt() optlen be unsigned.

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

datalink.h

[NET]: Kill skb->real_dev

2005-08-29 15:32:25 -07:00

dcbnl.h

dcbnl: Add support for setapp/getapp to netdev dcbnl_rtnl_ops

2009-09-01 01:24:30 -07:00

dn_dev.h

[DECnet]: Endian annotation and fixes for DECnet.

2006-03-20 22:42:39 -08:00

dn_fib.h

decnet: remove private wrappers of endian helpers

2008-11-27 00:12:47 -08:00

dn_neigh.h

[DECnet]: Endian annotation and fixes for DECnet.

2006-03-20 22:42:39 -08:00

dn_nsp.h

[DECnet]: Endian annotation and fixes for DECnet.

2006-03-20 22:42:39 -08:00

dn_route.h

[NET]: Wrap netdevice hardware header creation.

2007-10-10 16:52:50 -07:00

dn.h

decnet: compile fix for removal of byteorder wrapper

2008-11-27 23:04:13 -08:00

dsa.h

dsa: add switch chip cascading support

2009-03-21 19:06:54 -07:00

dsfield.h

[NET]: Constify include/net/dsfield.h

2008-01-28 14:55:58 -08:00

dst_ops.h

netns: embed ip6_dst_ops directly

2009-09-01 17:40:31 -07:00

dst.h

netns: embed ip6_dst_ops directly

2009-09-01 17:40:31 -07:00

esp.h

[IPSEC]: Use crypto_aead and authenc in ESP

2008-01-31 19:27:02 -08:00

ethoc.h

net: Add support for the OpenCores 10/100 Mbps Ethernet MAC.

2009-03-27 00:16:21 -07:00

fib_rules.h

net: Remove unused parameter from fill method in fib_rules_ops.

2009-05-20 17:26:23 -07:00

flow.h

netns xfrm: lookup in netns

2008-11-25 17:35:18 -08:00

garp.h

vlan: Add GVRP support

2008-07-05 21:26:57 -07:00

gen_stats.h

net: restore gnet_stats_basic to previous definition

2009-08-17 21:33:49 -07:00

genetlink.h

genetlink: make netns aware

2009-07-12 14:03:27 -07:00

icmp.h

mib: put icmpmsg statistics on struct net

2008-07-18 04:04:22 -07:00

ieee80211_radiotap.h

wireless: radiotap updates

2009-03-27 20:12:52 -04:00

ieee802154_netdev.h

ieee802154: add support for channel pages from IEEE 802.15.4-2006

2009-08-19 23:08:22 +04:00

ieee802154.h

ieee802154: move headers out of extra directory

2009-07-23 17:08:51 +04:00

if_inet6.h

ipv6: reorder struct inet6_ifaddr to remove padding on 64 bit builds

2009-03-21 13:29:05 -07:00

inet6_connection_sock.h

[TCP]: Restore SKB socket owner setting in tcp_transmit_skb().

2007-01-26 01:04:55 -08:00

inet6_hashtables.h

net: skb->dst accessors

2009-06-03 02:51:04 -07:00

inet_common.h

[NETNS]: Inet control socket should not hold a namespace.

2008-04-03 14:28:30 -07:00

inet_connection_sock.h

net: Make setsockopt() optlen be unsigned.

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

inet_ecn.h

net: replace __constant_{endian} uses in net headers

2009-02-14 22:58:35 -08:00

inet_frag.h

inet fragments: fix sparse warning: context imbalance

2009-02-26 23:13:35 -08:00

inet_hashtables.h

net: skb->dst accessors

2009-06-03 02:51:04 -07:00

inet_sock.h

Merge branch 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/vegard/kmemcheck

2009-06-16 13:09:51 -07:00

inet_timewait_sock.h

net: Fix struct inet_timewait_sock bitfield annotation

2009-10-20 01:13:26 -07:00

inetpeer.h

net: remove CVS keywords

2008-06-11 21:00:38 -07:00

ip6_checksum.h

[IPV6]: Dumb typo in generic csum_ipv6_magic()

2006-12-22 11:12:07 -08:00

ip6_fib.h

xfrm: select sane defaults for xfrm[4|6] gc_thresh

2009-07-30 18:52:15 -07:00

ip6_route.h

net: skb->dst accessors

2009-06-03 02:51:04 -07:00

ip6_tunnel.h

net: remove CVS keywords

2008-06-11 21:00:38 -07:00

ip_fib.h

net: Fix RPF to work with policy routing

2009-10-29 22:49:12 -07:00

ip_vs.h

net: mark read-only arrays as const

2009-08-05 10:42:58 -07:00

ip.h

netfilter: fix crashes in bridge netfilter caused by fragment jumps

2010-01-06 15:04:40 -08:00

ipcomp.h

ipsec: ipcomp - Merge IPComp implementations

2008-07-25 02:54:40 -07:00

ipconfig.h

net: remove CVS keywords

2008-06-11 21:00:38 -07:00

ipip.h

Revert "sit: stateless autoconf for isatap"

2009-09-26 20:28:07 -07:00

ipv6.h

netfilter: fix crashes in bridge netfilter caused by fragment jumps

2010-01-06 15:04:40 -08:00

ipx.h

net: replace __constant_{endian} uses in net headers

2009-02-14 22:58:35 -08:00

iw_handler.h

libipw: switch from ieee80211_* to libipw_* naming policy

2009-08-28 14:40:28 -04:00

lapb.h

Linux-2.6.12-rc2

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

lib80211.h

wireless: missing include in lib80211.h

2008-11-21 11:42:55 -05:00

llc_c_ac.h

Linux-2.6.12-rc2

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

llc_c_ev.h

Linux-2.6.12-rc2

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

llc_c_st.h

Linux-2.6.12-rc2

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

llc_conn.h

[NET]: Make socket creation namespace safe.

2007-10-10 16:49:07 -07:00

llc_if.h

[LLC]: Kill static inline llc_addrany

2008-02-29 11:46:17 -08:00

llc_pdu.h

[LLC]: skb allocation size for responses

2008-03-31 21:02:47 -07:00

llc_s_ac.h

Linux-2.6.12-rc2

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

llc_s_ev.h

Linux-2.6.12-rc2

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

llc_s_st.h

Linux-2.6.12-rc2

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

llc_sap.h

[LLC]: skb allocation size for responses

2008-03-31 21:02:47 -07:00

llc.h

[LLC]: station source mac address

2008-03-28 16:28:36 -07:00

mac80211.h

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

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

mip6.h

[IPV6] MIP6: Use our standard definitions for paddings.

2008-04-12 13:43:22 +09:00

ndisc.h

sysctl: remove "struct file *" argument of ->proc_handler

2009-09-24 07:21:04 -07:00

neighbour.h

net: make neigh_ops constant

2009-09-01 17:40:57 -07:00

net_namespace.h

net: explain netns notifiers a little better

2009-07-20 08:03:00 -07:00

netdma.h

net_dma: convert to dma_find_channel

2009-01-06 11:38:15 -07:00

netevent.h

[NET]: Remove unnecessary inclusion of dst.h

2008-01-28 14:53:38 -08:00

netlabel.h

netlabel: Cleanup the Smack/NetLabel code to fix incoming TCP connections

2009-03-28 15:01:37 +11:00

netlink.h

netlink: constify nlmsghdr arguments

2009-08-25 16:07:40 +02:00

netrom.h

ax25: netrom: rose: Fix timer oopses

2010-02-09 04:50:56 -08:00

nexthop.h

[IPv4]: FIB configuration using struct fib_config

2006-09-22 14:55:04 -07:00

nl802154.h

ieee802154: add support for channel pages from IEEE 802.15.4-2006

2009-08-19 23:08:22 +04:00

p8022.h

[NET]: Fix sparse warnings

2005-08-29 16:01:32 -07:00

pkt_cls.h

ematch: simpler tcf_em_unregister()

2008-11-16 23:01:49 -08:00

pkt_sched.h

pkt_sched: Revert tasklet_hrtimer changes.

2009-09-01 17:59:25 -07:00

protocol.h

net: constify struct inet6_protocol

2009-09-14 17:03:05 -07:00

psnap.h

snap: use const for descriptor

2009-03-21 19:06:50 -07:00

raw.h

[RAW]: Add raw_hashinfo member on struct proto.

2008-03-22 16:56:51 -07:00

rawv6.h

ipv6: Use correct data types for ICMPv6 type and code

2009-06-23 04:31:07 -07:00

red.h

[NET_SCHED]: turn PSCHED_GET_TIME into inline function

2007-04-25 22:27:55 -07:00

regulatory.h

cfg80211: clean up includes

2009-04-22 16:57:17 -04:00

request_sock.h

net: Fix memory leak in the proto_register function

2008-11-21 16:45:22 -08:00

rose.h

NET: ROSE: Don't use static buffer.

2009-07-26 19:11:14 -07:00

route.h

net: skb->rtable accessor

2009-06-03 02:51:02 -07:00

rtnetlink.h

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6

2009-09-10 18:17:09 -07:00

sch_generic.h

pkt_sched: Fix tx queue selection in tc_modify_qdisc

2009-09-15 02:53:07 -07:00

scm.h

cleanup: remove unused member in scm_cookie.

2009-07-05 19:16:10 -07:00

slhc_vj.h

[NET]: Remove __ARGS from include/net/slhc_vj.h

2005-07-05 15:12:04 -07:00

snmp.h

snmp: add missing counters for RFC 4293

2009-04-27 02:45:02 -07:00

sock.h

net: Fix struct sock bitfield annotation

2009-10-11 23:03:52 -07:00

stp.h

net: Add STP demux layer

2008-07-05 21:25:39 -07:00

tcp_states.h

[TCP]: Move the TCPF_ enum to tcp_states.h

2006-01-03 13:10:57 -08:00

tcp.h

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

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

timewait_sock.h

net: Fix memory leak in the proto_register function

2008-11-21 16:45:22 -08:00

transp_v6.h

inet: inet_connection_sock_af_ops const

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

udp.h

net: Make setsockopt() optlen be unsigned.

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

udplite.h

udp: introduce struct udp_table and multiple spinlocks

2008-10-29 01:41:45 -07:00

wext.h

wext: add back wireless/ dir in sysfs for cfg80211 interfaces

2009-09-28 16:55:07 -04:00

wimax.h

rfkill: rewrite

2009-06-03 14:06:13 -04:00

wpan-phy.h

ieee802154: add a sysfs representation of WPAN master devices

2009-08-19 23:08:20 +04:00

x25.h

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

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

x25device.h

[SK_BUFF]: Introduce skb_reset_mac_header(skb)

2007-04-25 22:24:32 -07:00

xfrm.h

xfrm: select sane defaults for xfrm[4|6] gc_thresh

2009-07-30 18:52:15 -07:00