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

Conflicts:
	drivers/net/e100.c
	drivers/net/e1000e/netdev.c

2010-04-27 12:49:13 -07:00

..

af_rds.c

net: sk_sleep() helper

2010-04-20 16:37:13 -07:00

bind.c

RDS: Add a debug message suggesting to load transport modules

2009-08-23 19:13:14 -07:00

cong.c

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

2010-04-11 14:53:53 -07:00

connection.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

ib_cm.c

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

2010-04-11 14:53:53 -07:00

ib_rdma.c

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

2010-04-11 14:53:53 -07:00

ib_recv.c

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

2010-04-11 14:53:53 -07:00

ib_ring.c

…

ib_send.c

RDS: Properly unmap when getting a remote access error

2010-03-16 21:17:00 -07:00

ib_stats.c

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu

2009-09-15 09:39:44 -07:00

ib_sysctl.c

sysctl: Drop & in front of every proc_handler.

2009-11-18 08:37:40 -08:00

ib.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

ib.h

RDS/IB+IW: Move recv processing to a tasklet

2009-10-30 15:06:39 -07:00

info.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

info.h

…

iw_cm.c

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

2010-04-11 14:53:53 -07:00

iw_rdma.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

iw_recv.c

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

2010-04-11 14:53:53 -07:00

iw_ring.c

…

iw_send.c

RDS: Do not BUG() on error returned from ib_post_send

2010-03-16 21:16:53 -07:00

iw_stats.c

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu

2009-09-15 09:39:44 -07:00

iw_sysctl.c

sysctl: Drop & in front of every proc_handler.

2009-11-18 08:37:40 -08:00

iw.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

iw.h

RDS/IB+IW: Move recv processing to a tasklet

2009-10-30 15:06:39 -07:00

Kconfig

RDS: Modularize RDMA and TCP transports

2009-08-23 19:13:09 -07:00

loop.c

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

2010-04-11 14:53:53 -07:00

loop.h

…

Makefile

RDS: Modularize RDMA and TCP transports

2009-08-23 19:13:09 -07:00

message.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

page.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

rdma_transport.c

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

2010-04-27 12:49:13 -07:00

rdma_transport.h

…

rdma.c

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

2010-04-11 14:53:53 -07:00

rdma.h

RDS: Add GET_MR_FOR_DEST sockopt

2009-10-30 15:06:37 -07:00

rds.h

net: sk_sleep() helper

2010-04-20 16:37:13 -07:00

recv.c

net: sk_sleep() helper

2010-04-20 16:37:13 -07:00

send.c

net: sk_sleep() helper

2010-04-20 16:37:13 -07:00

stats.c

…

sysctl.c

sysctl: Drop & in front of every proc_handler.

2009-11-18 08:37:40 -08:00

tcp_connect.c

net/rds: remove uses of NIPQUAD, use %pI4

2010-02-03 20:16:48 -08:00

tcp_listen.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

tcp_recv.c

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

2010-04-11 14:53:53 -07:00

tcp_send.c

RDS/TCP: Wait to wake thread when write space available

2010-03-16 21:16:55 -07:00

tcp_stats.c

…

tcp.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

tcp.h

…

threads.c

RDS: Enable per-cpu workqueue threads

2010-03-16 21:17:02 -07:00

transport.c

RDS: Track transports via an array, not a list

2009-08-23 19:13:12 -07:00