David Howells 4c1ac1b491 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 ...

Conflicts:

	drivers/infiniband/core/iwcm.c
	drivers/net/chelsio/cxgb2.c
	drivers/net/wireless/bcm43xx/bcm43xx_main.c
	drivers/net/wireless/prism54/islpci_eth.c
	drivers/usb/core/hub.h
	drivers/usb/input/hid-core.c
	net/core/netpoll.c

Fix up merge failures with Linus's head and fix new compilation failures.

Signed-Off-By: David Howells <dhowells@redhat.com>

2006-12-05 14:37:56 +00:00

..

datagram.c

[NET]: Annotate __skb_checksum_complete() and friends.

2006-12-02 21:23:38 -08:00

dev_mcast.c

[NET]: Remove unnecessary config.h includes from net/

2006-09-22 14:54:21 -07:00

dev.c

[NET]: Split skb->csum

2006-12-02 21:27:18 -08:00

dst.c

[NET]: add_timer -> mod_timer() in dst_run_gc()

2006-08-09 02:25:54 -07:00

ethtool.c

[ETHTOOL]: Remove some entries from non-root command list.

2006-09-28 18:03:12 -07:00

fib_rules.c

[NETLINK]: Do precise netlink message allocations where possible

2006-12-02 21:22:11 -08:00

filter.c

[NET] net/core: Annotations.

2006-12-02 21:22:49 -08:00

flow.c

IPsec: propagate security module errors up from flow_cache_lookup

2006-10-11 23:59:34 -07:00

gen_estimator.c

[NET]: More kzalloc conversions.

2006-04-09 22:25:48 -07:00

gen_stats.c

Linux-2.6.12-rc2

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

iovec.c

[NET]: Annotate csum_partial() callers in net/*

2006-12-02 21:23:32 -08:00

link_watch.c

WorkStruct: Pass the work_struct pointer instead of context data

2006-11-22 14:55:48 +00:00

Makefile

[NET]: The scheduled removal of the frame diverter.

2006-12-02 21:22:23 -08:00

neighbour.c

[NET] neighbour: Use kmemdup where applicable

2006-12-02 21:30:14 -08:00

net-sysfs.c

[PATCH] WE-21 support (core API)

2006-09-25 16:52:14 -04:00

netevent.c

[NET]: Network Event Notifier Mechanism.

2006-08-02 13:38:20 -07:00

netpoll.c

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

2006-12-05 14:37:56 +00:00

pktgen.c

[NET] net/core: Annotations.

2006-12-02 21:22:49 -08:00

request_sock.c

[NET]: Size listen hash tables using backlog hint

2006-12-02 21:21:44 -08:00

rtnetlink.c

[RTNETLINK]: Add rtnl_put_cacheinfo() to unify some code

2006-12-02 21:30:44 -08:00

scm.c

[NET]: File descriptor loss while receiving SCM_RIGHTS

2006-10-11 23:59:48 -07:00

skbuff.c

[NET]: Split skb->csum

2006-12-02 21:27:18 -08:00

sock.c

[NET]: Conditionally use bh_lock_sock_nested in sk_receive_skb

2006-12-02 21:23:51 -08:00

stream.c

[NET]: fix __sk_stream_mem_reclaim

2006-07-12 17:58:53 -07:00

sysctl_net_core.c

[NET]: The scheduled removal of the frame diverter.

2006-12-02 21:22:23 -08:00

user_dma.c

[I/OAT]: net/core/user_dma.c should #include <net/netdma.h>

2006-07-21 14:49:49 -07:00

utils.c

[NET]: Accept wildcard delimiters in in[46]_pton

2006-12-02 22:04:04 -08:00

wireless.c

[PATCH] wireless: WE-20 compatibility for ESSID and NICKN ioctls

2006-10-19 17:08:19 -04:00