Linus Torvalds de0a5345a5 Merge branch 'for-linus' of git://github.com/richardweinberger/linux ... * 'for-linus' of git://github.com/richardweinberger/linux: (90 commits) um: fix ubd cow size um: Fix kmalloc argument order in um/vdso/vma.c um: switch to use of drivers/Kconfig UserModeLinux-HOWTO.txt: fix a typo UserModeLinux-HOWTO.txt: remove ^H characters um: we need sys/user.h only on i386 um: merge delay_{32,64}.c um: distribute exports to where exported stuff is defined um: kill system-um.h um: generic ftrace.h will do... um: segment.h is x86-only and needed only there um: asm/pda.h is not needed anymore um: hw_irq.h can go generic as well um: switch to generic-y um: clean Kconfig up a bit um: a couple of missing dependencies... um: kill useless argument of free_chan() and free_one_chan() um: unify ptrace_user.h um: unify KSTK_... um: fix gcov build breakage ...		2011-11-02 09:45:39 -07:00
..
chan_kern.c	um: kill useless argument of free_chan() and free_one_chan()	2011-11-02 14:15:28 +01: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: take chan_*.h and line.h to arch/um/drivers	2011-11-02 14:15:12 +01:00
chan.h	um: take chan_*.h and line.h to arch/um/drivers	2011-11-02 14:15:12 +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	uml: cow_user.c warning corrections	2011-07-25 20:57:13 -07:00
cow.h
daemon_kern.c
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
harddog_user.c	um: -include user.h for USER_OBJ, trim includes	2011-11-02 14:14:44 +01:00
hostaudio_kern.c
line.c	um: take chan_*.h and line.h to arch/um/drivers	2011-11-02 14:15:12 +01:00
line.h	um: take chan_*.h and line.h to arch/um/drivers	2011-11-02 14:15:12 +01:00
Makefile
mconsole_kern.c
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
net_kern.c	net: remove use of ndo_set_multicast_list in drivers	2011-08-17 20:22:03 -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
pcap_user.c	um: -include user.h for USER_OBJ, trim includes	2011-11-02 14:14:44 +01:00
pcap_user.h
port_kern.c
port_user.c	um: -include user.h for USER_OBJ, trim includes	2011-11-02 14:14:44 +01:00
port.h
pty.c	um: -include user.h for USER_OBJ, trim includes	2011-11-02 14:14:44 +01:00
random.c
slip_common.c
slip_common.h
slip_kern.c
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
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: take chan_*.h and line.h to arch/um/drivers	2011-11-02 14:15:12 +01:00
ssl.h
stderr_console.c
stdio_console.c	um: take chan_*.h and line.h to arch/um/drivers	2011-11-02 14:15:12 +01:00
stdio_console.h
tty.c	um: -include user.h for USER_OBJ, trim includes	2011-11-02 14:14:44 +01:00
ubd_kern.c	um: fix ubd cow size	2011-11-02 14:15:42 +01:00
ubd_user.c	um: -include user.h for USER_OBJ, trim includes	2011-11-02 14:14:44 +01:00
ubd_user.h	um: take ubd_user.h to its users...	2011-11-02 14:15:22 +01:00
umcast_kern.c
umcast_user.c	um: -include user.h for USER_OBJ, trim includes	2011-11-02 14:14:44 +01:00
umcast.h
vde_kern.c
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
xterm.c	um: -include user.h for USER_OBJ, trim includes	2011-11-02 14:14:44 +01:00
xterm.h