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
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
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
daemon_user.c
daemon.h
fd.c
harddog_kern.c
harddog_user.c
hostaudio_kern.c
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
mconsole_kern.c	Revert "rcu: Move PREEMPT_RCU preemption to switch_to() invocation"	2012-07-02 11:39:19 -07:00
mconsole_kern.h
mconsole_user.c
mconsole.h
mmapper_kern.c
net_kern.c	arch: Use eth_random_addr	2012-07-16 22:39:25 -07:00
net_user.c
null.c
pcap_kern.c
pcap_user.c
pcap_user.h
port_kern.c	um: Implement um_free_irq()	2012-05-21 21:09:36 +02:00
port_user.c
port.h
pty.c
random.c
slip_common.c
slip_common.h
slip_kern.c
slip_user.c
slip.h
slirp_kern.c
slirp_user.c
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
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
tty.c
ubd_kern.c
ubd_user.c
ubd.h
umcast_kern.c
umcast_user.c
umcast.h
vde_kern.c
vde_user.c
vde.h
xterm_kern.c	um: Implement um_free_irq()	2012-05-21 21:09:36 +02:00
xterm.c
xterm.h