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

Conflicts:

	drivers/net/e1000e/ich8lan.c

2008-12-15 20:03:50 -08:00

..

chan_kern.c

uml: remove a useless function

2008-04-28 08:58:28 -07:00

chan_user.c

uml: fix build when SLOB is enabled

2008-05-13 08:02:22 -07:00

cow_sys.h

uml: fix build when SLOB is enabled

2008-05-13 08:02:22 -07:00

cow_user.c

uml: arch/um/drivers formatting

2007-10-16 09:43:09 -07:00

cow.h

[PATCH] uml: avoid warnings for diffent names for an unsigned quadword

2006-04-11 06:18:37 -07:00

daemon_kern.c

um: Kill directly reference of netdev->priv

2008-12-04 15:07:33 -08:00

daemon_user.c

uml: fix build when SLOB is enabled

2008-05-13 08:02:22 -07:00

daemon.h

uml: network formatting

2007-10-16 09:43:08 -07:00

fd.c

uml: fix build when SLOB is enabled

2008-05-13 08:02:22 -07:00

harddog_kern.c

uml-harddog: BKL pushdown

2008-07-02 15:06:26 -06:00

harddog_user.c

uml: fix helper_wait calls in watchdog

2008-02-23 17:12:15 -08:00

hostaudio_kern.c

uml: fix errno return

2008-05-13 08:02:21 -07:00

line.c

uml: small cleanups and note bugs to be dealt with by uml authors...

2008-10-13 09:51:40 -07:00

Makefile

x86, um: get rid of arch/um/os symlink

2008-10-22 22:55:22 -07:00

mcast_kern.c

um: Kill directly reference of netdev->priv

2008-12-04 15:07:33 -08:00

mcast_user.c

uml: fix build when SLOB is enabled

2008-05-13 08:02:22 -07:00

mcast.h

uml: network formatting

2007-10-16 09:43:08 -07:00

mconsole_kern.c

uml: boot broken due to buffer overrun

2008-12-10 08:01:52 -08:00

mconsole_user.c

uml: make three functions static

2008-04-28 08:58:28 -07:00

mmapper_kern.c

uml-mmapper: BKL pushdown

2008-07-02 15:06:26 -06:00

net_kern.c

um: Kill directly reference of netdev->priv

2008-12-04 15:07:33 -08:00

net_user.c

uml: fix build when SLOB is enabled

2008-05-13 08:02:22 -07:00

null.c

spelling fixes: arch/um/

2007-10-20 01:23:03 +02:00

pcap_kern.c

um: Kill directly reference of netdev->priv

2008-12-04 15:07:33 -08:00

pcap_user.c

missed kmalloc() in pcap_user.c

2008-05-21 16:55:57 -07:00

pcap_user.h

[PATCH] missed const in prototype

2006-10-10 15:37:24 -07:00

port_kern.c

uml: port mutex conversion

2008-02-05 09:44:32 -08:00

port_user.c

uml: fix build when SLOB is enabled

2008-05-13 08:02:22 -07:00

port.h

Linux-2.6.12-rc2

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

pty.c

uml: fix build when SLOB is enabled

2008-05-13 08:02:22 -07:00

random.c

uml-random: BKL pushdown

2008-07-02 15:06:26 -06:00

slip_common.c

[PATCH] uml: slirp and slip driver cleanups and fixes

2005-06-13 20:58:43 -07:00

slip_common.h

[PATCH] uml: fix hugest stack users

2006-02-01 08:53:22 -08:00

slip_kern.c

um: Kill directly reference of netdev->priv

2008-12-04 15:07:33 -08:00

slip_user.c

uml: fix build when SLOB is enabled

2008-05-13 08:02:22 -07:00

slip.h

[PATCH] uml: const more data

2006-09-27 08:26:15 -07:00

slirp_kern.c

um: Kill directly reference of netdev->priv

2008-12-04 15:07:33 -08:00

slirp_user.c

uml: tidy helper code

2008-02-05 09:44:30 -08:00

slirp.h

[PATCH] uml: const more data

2006-09-27 08:26:15 -07:00

ssl.c

uml: tidy kern_util.h

2008-02-05 09:44:26 -08:00

ssl.h

Linux-2.6.12-rc2

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

stderr_console.c

spelling fixes: arch/um/

2007-10-20 01:23:03 +02:00

stdio_console.c

uml: make several things static

2008-04-28 08:58:28 -07:00

stdio_console.h

Linux-2.6.12-rc2

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

tty.c

uml: fix build when SLOB is enabled

2008-05-13 08:02:22 -07:00

ubd_kern.c

[PATCH] switch ubd

2008-10-21 07:47:34 -04:00

ubd_user.c

uml: tidy kern_util.h

2008-02-05 09:44:26 -08:00

vde_kern.c

um: Kill directly reference of netdev->priv

2008-12-04 15:07:33 -08:00

vde_user.c

uml: add missing space

2008-02-05 09:44:28 -08:00

vde.h

uml: add VDE networking support

2007-10-16 09:43:05 -07:00

xterm_kern.c

uml: xterm driver tidying

2007-07-16 09:05:38 -07:00

xterm.c

uml: fix build when SLOB is enabled

2008-05-13 08:02:22 -07:00

xterm.h

Linux-2.6.12-rc2

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