linux/arch/um/drivers
David S. Miller abaa72d7fd Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
2012-07-19 11:17:30 -07:00
..
chan_kern.c um: Implement um_free_irq() 2012-05-21 21:09:36 +02:00
chan_user.c um: take register_winch_irq() into the caller of is_skas_winch() 2011-11-02 14:15:11 +01:00
chan_user.h um: chan_init_pri is dead now 2012-03-25 00:29:54 +01:00
chan.h um: switch close_chan() to struct line 2012-03-25 00:29:54 +01:00
cow_sys.h um: -include user.h for USER_OBJ, trim includes 2011-11-02 14:14:44 +01:00
cow_user.c um: switch cow_user.h to htobe{32,64}/betoh{32,64} 2012-04-10 00:13:45 +02:00
cow.h um: switch cow_user.h to htobe{32,64}/betoh{32,64} 2012-04-10 00:13:45 +02:00
daemon_kern.c um: Kill directly reference of netdev->priv 2008-12-04 15:07:33 -08:00
daemon_user.c um: -include user.h for USER_OBJ, trim includes 2011-11-02 14:14:44 +01:00
daemon.h
fd.c um: -include user.h for USER_OBJ, trim includes 2011-11-02 14:14:44 +01: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: -include user.h for USER_OBJ, trim includes 2011-11-02 14:14:44 +01: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: Implement um_free_irq() 2012-05-21 21:09:36 +02:00
line.h um: line->have_irq is never checked... 2012-03-25 00:29:54 +01:00
Makefile um: add ucast ethernet transport 2011-05-25 08:39:41 -07:00
mconsole_kern.c Revert "rcu: Move PREEMPT_RCU preemption to switch_to() invocation" 2012-07-02 11:39:19 -07:00
mconsole_kern.h um: take mconsole*.h to arch/um/drivers 2011-11-02 14:15:12 +01:00
mconsole_user.c um: -include user.h for USER_OBJ, trim includes 2011-11-02 14:14:44 +01:00
mconsole.h um: take mconsole*.h to arch/um/drivers 2011-11-02 14:15:12 +01:00
mmapper_kern.c treewide: remove extra semicolons 2011-04-10 17:01:05 +02:00
net_kern.c arch: Use eth_random_addr 2012-07-16 22:39:25 -07:00
net_user.c um: -include user.h for USER_OBJ, trim includes 2011-11-02 14:14:44 +01:00
null.c
pcap_kern.c um: Kill directly reference of netdev->priv 2008-12-04 15:07:33 -08:00
pcap_user.c um: -include user.h for USER_OBJ, trim includes 2011-11-02 14:14:44 +01:00
pcap_user.h uml: remove useless comments 2009-04-01 08:59:17 -07:00
port_kern.c um: Implement um_free_irq() 2012-05-21 21:09:36 +02:00
port_user.c um: -include user.h for USER_OBJ, trim includes 2011-11-02 14:14:44 +01:00
port.h uml: remove useless comments 2009-04-01 08:59:17 -07:00
pty.c um: -include user.h for USER_OBJ, trim includes 2011-11-02 14:14:44 +01:00
random.c um: irq: Remove IRQF_DISABLED 2012-03-25 00:29:52 +01: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 um: -include user.h for USER_OBJ, trim includes 2011-11-02 14:14:44 +01:00
slip.h
slirp_kern.c UML: Fix some apparent bitrot 2009-06-25 11:22:13 -07:00
slirp_user.c um: -include user.h for USER_OBJ, trim includes 2011-11-02 14:14:44 +01:00
slirp.h
ssl.c um: switch users of ->chan_list to ->chan_{in,out} (easy cases) 2012-03-25 00:29:54 +01:00
ssl.h uml: remove useless comments 2009-04-01 08:59:17 -07:00
stderr_console.c
stdio_console.c um: switch users of ->chan_list to ->chan_{in,out} (easy cases) 2012-03-25 00:29:54 +01:00
stdio_console.h uml: remove useless comments 2009-04-01 08:59:17 -07:00
tty.c um: -include user.h for USER_OBJ, trim includes 2011-11-02 14:14:44 +01:00
ubd_kern.c um: clean up the includes in ubd 2012-03-25 00:29:52 +01:00
ubd_user.c um: clean up the includes in ubd 2012-03-25 00:29:52 +01:00
ubd.h um: clean up the includes in ubd 2012-03-25 00:29:52 +01:00
umcast_kern.c um: add ucast ethernet transport 2011-05-25 08:39:41 -07:00
umcast_user.c um: -include user.h for USER_OBJ, trim includes 2011-11-02 14:14:44 +01: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 um: -include user.h for USER_OBJ, trim includes 2011-11-02 14:14:44 +01:00
vde.h
xterm_kern.c um: Implement um_free_irq() 2012-05-21 21:09:36 +02:00
xterm.c um: -include user.h for USER_OBJ, trim includes 2011-11-02 14:14:44 +01:00
xterm.h uml: remove useless comments 2009-04-01 08:59:17 -07:00