Linus Torvalds 59be2e04e5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 ... * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (26 commits) net: sh_eth alignment fix for sh7724 using NET_IP_ALIGN V2 ixgbe: allow tx of pre-formatted vlan tagged packets ixgbe: Fix 82598 premature copper PHY link indicatation ixgbe: Fix tx_restart_queue/non_eop_desc statistics counters bcm63xx_enet: fix compilation failure after get_stats_count removal packet: dont call sleeping functions while holding rcu_read_lock() tcp: Revert per-route SACK/DSACK/TIMESTAMP changes. ipvs: zero usvc and udest netfilter: fix crashes in bridge netfilter caused by fragment jumps ipv6: reassembly: use seperate reassembly queues for conntrack and local delivery sky2: leave PCI config space writeable sky2: print Optima chip name x25: Update maintainer. ipvs: fix synchronization on connection close netfilter: xtables: document minimal required version drivers/net/bonding/: : use pr_fmt can: CAN_MCP251X should depend on HAS_DMA drivers/net/usb: Correct code taking the size of a pointer drivers/net/cpmac.c: Correct code taking the size of a pointer drivers/net/sfc: Correct code taking the size of a pointer ...		2009-12-16 10:33:18 -08:00
..
9p	9p: fix readdir corner cases	2009-11-02 08:43:45 -06:00
bluetooth	Bluetooth: Implement RejActioned flag	2009-12-03 19:34:24 +01: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	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2009-12-16 10:33:18 -08:00
netns	net: Allow xfrm_user_net_exit to batch efficiently.	2009-12-03 12:22:03 -08:00
phonet	Phonet: convert devices list to RCU	2009-11-18 10:08:26 -08:00
sctp	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-12-09 19:43:33 -08:00
tc_act	pkt_sched: skbedit add support for setting mark	2009-10-22 21:56:42 -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	net: Fix soft lockups/OOM issues w/ unix garbage collector	2008-11-26 15:32:27 -08:00
ah.h	net: cleanup include/net	2009-11-04 05:06:25 -08: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	nl80211: PMKSA caching support	2009-11-28 15:05:05 -05: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: fix compat_sys_recvmmsg parameter type	2009-12-11 15:07:56 -08: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.h	decnet: compile fix for removal of byteorder wrapper	2008-11-27 23:04:13 -08:00
dn_dev.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2009-12-08 07:55:01 -08:00
dn_fib.h	net: cleanup include/net	2009-11-04 05:06:25 -08:00
dn_neigh.h	[DECnet]: Endian annotation and fixes for DECnet.	2006-03-20 22:42:39 -08:00
dn_nsp.h	net: cleanup include/net	2009-11-04 05:06:25 -08:00
dn_route.h	[NET]: Wrap netdevice hardware header creation.	2007-10-10 16:52:50 -07: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.h	tcp: Revert per-route SACK/DSACK/TIMESTAMP changes.	2009-12-15 20:56:42 -08:00
dst_ops.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: Allow fib_rule_unregister to batch	2009-12-03 12:22:55 -08: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: cleanup include/net	2009-11-04 05:06:25 -08:00
genetlink.h	net: cleanup include/net	2009-11-04 05:06:25 -08:00
icmp.h	mib: put icmpmsg statistics on struct net	2008-07-18 04:04:22 -07:00
ieee80211_radiotap.h	mac80211: fix radiotap header generation	2009-10-30 16:49:20 -04:00
ieee802154.h	ieee802154: move headers out of extra directory	2009-07-23 17:08:51 +04:00
ieee802154_netdev.h	ieee802154: add an mlme_ops call to retrieve PHY object	2009-11-06 14:32:18 +03:00
if_inet6.h	net: cleanup include/net	2009-11-04 05:06:25 -08: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	tcp: Fix a connect() race with timewait sockets	2009-12-08 20:17:51 -08: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	tcp: Fix a connect() race with timewait sockets	2009-12-08 20:17:51 -08:00
inet_sock.h	inet: rename some inet_sock fields	2009-10-18 18:52:53 -07:00
inet_timewait_sock.h	tcp: Fix a connect() race with timewait sockets	2009-12-08 20:17:51 -08:00
inetpeer.h	inetpeer: Optimize inet_getid()	2009-11-13 20:46:58 -08:00
ip.h	netfilter: fix crashes in bridge netfilter caused by fragment jumps	2009-12-15 16:59:59 +01:00
ip6_checksum.h	[IPV6]: Dumb typo in generic csum_ipv6_magic()	2006-12-22 11:12:07 -08:00
ip6_fib.h	net: cleanup include/net	2009-11-04 05:06:25 -08:00
ip6_route.h	net: cleanup include/net	2009-11-04 05:06:25 -08:00
ip6_tunnel.h	net: remove CVS keywords	2008-06-11 21:00:38 -07:00
ip_fib.h	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2009-11-06 00:55:55 -08:00
ip_vs.h	net: cleanup include/net	2009-11-04 05:06:25 -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	net: cleanup include/net	2009-11-04 05:06:25 -08:00
ipv6.h	netfilter: fix crashes in bridge netfilter caused by fragment jumps	2009-12-15 16:59:59 +01:00
ipx.h	net: replace __constant_{endian} uses in net headers	2009-02-14 22:58:35 -08:00
iw_handler.h	net: cleanup include/net	2009-11-04 05:06:25 -08: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.h	[LLC]: station source mac address	2008-03-28 16:28:36 -07:00
llc_c_ac.h
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
mac80211.h	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6	2009-12-04 13:25:15 -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	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu	2009-12-14 09:58:24 -08:00
net_namespace.h	net: Add support for batching network namespace cleanups	2009-12-03 12:22:01 -08: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	netrom: convert to internal net_device_stats	2009-01-21 14:02:01 -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	net: rename skb->iif to skb->skb_iif	2009-11-20 15:35:04 -08:00
pkt_sched.h	net: cleanup include/net	2009-11-04 05:06:25 -08:00
protocol.h	net: drop capability from protocol definitions	2009-11-05 21:40:17 -08: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: cleanup include/net	2009-11-04 05:06:25 -08:00
regulatory.h	cfg80211: clean up includes	2009-04-22 16:57:17 -04:00
request_sock.h	TCPCT part 1a: add request_values parameter for sending SYNACK	2009-12-02 22:07:23 -08:00
rose.h	NET: ROSE: Don't use static buffer.	2009-07-26 19:11:14 -07:00
route.h	net: NETDEV_UNREGISTER_PERNET -> NETDEV_UNREGISTER_BATCH	2009-12-01 16:15:50 -08:00
rtnetlink.h	net: Support specifying the network namespace upon device creation.	2009-11-08 00:53:51 -08:00
sch_generic.h	net: cleanup include/net	2009-11-04 05:06:25 -08:00
scm.h	net: cleanup include/net	2009-11-04 05:06:25 -08:00
slhc_vj.h
snmp.h	this_cpu: Use this_cpu operations for SNMP statistics	2009-10-03 19:48:22 +09:00
sock.h	udp: secondary hash on (local port, local address)	2009-11-08 20:53:06 -08:00
stp.h	net: Add STP demux layer	2008-07-05 21:25:39 -07:00
tcp.h	tcp: Revert per-route SACK/DSACK/TIMESTAMP changes.	2009-12-15 20:56:42 -08:00
tcp_states.h
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	udp: bind() optimisation	2009-11-10 20:54:38 -08:00
udplite.h	udp: introduce struct udp_table and multiple spinlocks	2008-10-29 01:41:45 -07:00
wext.h	wext: refactor	2009-10-07 16:39:43 -04:00
wimax.h	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-12-09 19:43:33 -08:00
wpan-phy.h	ieee802154: add support for creation/removal of logic interfaces	2009-11-06 14:32:24 +03:00
x25.h	X25: Move SYSCTL ifdefs into header	2009-11-29 00:24:59 -08:00
x25device.h	[SK_BUFF]: Introduce skb_reset_mac_header(skb)	2007-04-25 22:24:32 -07:00
xfrm.h	xfrm: Store aalg in xfrm_state with a user specified truncation length	2009-11-25 15:48:38 -08:00