David S. Miller 8decf86879 Merge branch 'master' of github.com:davem330/net ...

Conflicts:
	MAINTAINERS
	drivers/net/Kconfig
	drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
	drivers/net/ethernet/broadcom/tg3.c
	drivers/net/wireless/iwlwifi/iwl-pci.c
	drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c
	drivers/net/wireless/rt2x00/rt2800usb.c
	drivers/net/wireless/wl12xx/main.c

2011-09-22 03:23:13 -04:00

..

chan_kern.c

um: remove dead code

2011-07-25 20:57:13 -07:00

chan_user.c

…

cow_sys.h

…

cow_user.c

uml: cow_user.c warning corrections

2011-07-25 20:57:13 -07:00

cow.h

…

daemon_kern.c

…

daemon_user.c

…

daemon.h

…

fd.c

…

harddog_kern.c

Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl

2010-10-22 10:52:56 -07:00

harddog_user.c

um: adjust size of pid_buf

2011-07-25 20:57:13 -07:00

hostaudio_kern.c

Merge branch 'config' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl

2010-10-22 10:43:11 -07:00

line.c

um: fix free_winch() mess

2011-09-14 18:09:37 -07:00

Makefile

um: add ucast ethernet transport

2011-05-25 08:39:41 -07:00

mconsole_kern.c

open-style analog of vfs_path_lookup()

2011-03-14 09:15:28 -04:00

mconsole_user.c

…

mmapper_kern.c

treewide: remove extra semicolons

2011-04-10 17:01:05 +02:00

net_kern.c

net: remove use of ndo_set_multicast_list in drivers

2011-08-17 20:22:03 -07:00

net_user.c

uml: drivers/net_user.c memory leak fix

2011-07-25 20:57:12 -07:00

null.c

…

pcap_kern.c

…

pcap_user.c

…

pcap_user.h

…

port_kern.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

port_user.c

…

port.h

…

pty.c

…

random.c

llseek: automatically add .llseek fop

2010-10-15 15:53:27 +02:00

slip_common.c

…

slip_common.h

…

slip_kern.c

…

slip_user.c

uml: drivers/slip_user.c memory leak fix

2011-07-25 20:57:13 -07:00

slip.h

…

slirp_kern.c

…

slirp_user.c

…

slirp.h

…

ssl.c

…

ssl.h

…

stderr_console.c

…

stdio_console.c

…

stdio_console.h

…

tty.c

…

ubd_kern.c

um: Replace deprecated spinlock initialization

2011-01-27 12:30:37 +01:00

ubd_user.c

…

umcast_kern.c

um: add ucast ethernet transport

2011-05-25 08:39:41 -07:00

umcast_user.c

um: add ucast ethernet transport

2011-05-25 08:39:41 -07:00

umcast.h

um: add ucast ethernet transport

2011-05-25 08:39:41 -07:00

vde_kern.c

…

vde_user.c

…

vde.h

…

xterm_kern.c

…

xterm.c

um: drivers/xterm.c: fix a file descriptor leak

2011-09-14 18:09:37 -07:00

xterm.h

…