David S. Miller 198d6ba4d7 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ...

Conflicts:

	drivers/isdn/i4l/isdn_net.c
	fs/cifs/connect.c

2008-11-18 23:38:23 -08:00

..

datagram.c

net: sk_free_datagram() should use sk_mem_reclaim_partial()

2008-11-05 01:38:06 -08:00

dev_mcast.c

net: Rationalise email address: Network Specific Parts

2008-10-13 19:01:08 -07:00

dev.c

net: use %pF for /proc/net/ptype

2008-11-16 19:50:35 -08:00

dst.c

net: speedup dst_release()

2008-11-14 00:53:54 -08:00

ethtool.c

netdev: Add support for rx flow hash configuration, using ethtool.

2008-07-02 03:47:41 -07:00

fib_rules.c

net: fib_rules ordering fixes.

2008-11-07 22:52:34 -08:00

filter.c

net: Tyop of sk_filter() comment

2008-07-01 19:55:40 -07:00

flow.c

net: mark flow_cache_cpu_prepare() as __init

2008-11-06 23:06:44 -08:00

gen_estimator.c

Revert "pkt_sched: Protect gen estimators under est_lock."

2008-08-18 22:32:10 -07:00

gen_stats.c

[NET_SCHED]: Convert packet schedulers from rtnetlink to new netlink API

2008-01-28 15:11:10 -08:00

iovec.c

net: Use standard structures for generic socket address structures.

2008-07-19 22:35:47 -07:00

kmap_skb.h

[PATCH] severing skbuff.h -> highmem.h

2006-12-04 02:00:29 -05:00

link_watch.c

net: Clean up explicit ->tx_queue references in link watch.

2008-07-08 23:01:06 -07:00

Makefile

net: Add SKB DMA mapping helper functions.

2008-09-11 04:51:14 -07:00

neighbour.c

net: Cleanup of neighbour code

2008-11-12 00:54:54 -08:00

net_namespace.c

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

2008-10-31 00:17:34 -07:00

net-sysfs.c

net: struct device - replace bus_id with dev_name(), dev_set_name()

2008-11-10 13:55:14 -08:00

net-sysfs.h

netns: Fix device renaming for sysfs

2008-05-02 17:00:58 -07:00

netevent.c

[NET]: net/core/netevent.c should #include <net/netevent.h>

2007-07-05 17:40:27 -07:00

netpoll.c

net: convert print_mac to %pM

2008-10-27 17:06:18 -07:00

pktgen.c

pktgen: add full reset functionality

2008-11-10 16:48:03 -08:00

request_sock.c

net: convert BUG_TRAP to generic WARN_ON

2008-07-25 21:43:18 -07:00

rtnetlink.c

rtnetlink: propagate error from dev_change_flags in do_setlink()

2008-11-16 23:20:31 -08:00

scm.c

scm: fix scm_fp_list->list initialization made in wrong place

2008-11-14 14:51:45 -08:00

skb_dma_map.c

net: Fix off-by-one in skb_dma_map

2008-10-12 21:07:34 -07:00

skbuff.c

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

2008-11-11 15:43:02 -08:00

sock.c

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

2008-11-18 23:38:23 -08:00

stream.c

net: Rationalise email address: Network Specific Parts

2008-10-13 19:01:08 -07:00

sysctl_net_core.c

net: '&' redux

2008-11-03 18:21:05 -08:00

user_dma.c

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

2008-07-26 20:17:56 -07:00

utils.c

printk ratelimiting rewrite

2008-07-25 10:53:29 -07:00