linux/arch/um/drivers
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 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: cow_user.c warning corrections 2011-07-25 20:57:13 -07:00
cow.h
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 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 uml: make three functions static 2008-04-28 08:58:28 -07:00
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 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 uml: remove useless comments 2009-04-01 08:59:17 -07:00
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 uml: fix build when SLOB is enabled 2008-05-13 08:02:22 -07:00
port.h uml: remove useless comments 2009-04-01 08:59:17 -07:00
pty.c uml: fix build when SLOB is enabled 2008-05-13 08:02:22 -07:00
random.c llseek: automatically add .llseek fop 2010-10-15 15:53:27 +02:00
slip_common.c
slip_common.h
slip_kern.c UML: Fix some apparent bitrot 2009-06-25 11:22:13 -07:00
slip_user.c uml: drivers/slip_user.c memory leak fix 2011-07-25 20:57:13 -07:00
slip.h
slirp_kern.c UML: Fix some apparent bitrot 2009-06-25 11:22:13 -07:00
slirp_user.c uml: tidy helper code 2008-02-05 09:44:30 -08:00
slirp.h
ssl.c uml: tidy kern_util.h 2008-02-05 09:44:26 -08:00
ssl.h uml: remove useless comments 2009-04-01 08:59:17 -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 uml: remove useless comments 2009-04-01 08:59:17 -07:00
tty.c uml: fix build when SLOB is enabled 2008-05-13 08:02:22 -07:00
ubd_kern.c um: Replace deprecated spinlock initialization 2011-01-27 12:30:37 +01:00
ubd_user.c uml: tidy kern_util.h 2008-02-05 09:44:26 -08:00
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 um: Kill directly reference of netdev->priv 2008-12-04 15:07:33 -08:00
vde_user.c uml: fix vde network backend in user mode linux 2009-02-20 17:57:48 -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 um: drivers/xterm.c: fix a file descriptor leak 2011-09-14 18:09:37 -07:00
xterm.h uml: remove useless comments 2009-04-01 08:59:17 -07:00