Linus Torvalds 1871e845e5 Merge branch 'for-linus-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml ... Pull UML fixes from Richard Weinberger: "This patch set contains mostly fixes and cleanups. The UML tty driver uses now tty_port and is no longer broken like hell :-)" * 'for-linus-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml: um: Add arch/x86/um to MAINTAINERS um: pass siginfo to guest process um: fix ubd_file_size for read-only files um: pull interrupt_end() into userspace() um: split syscall_trace(), pass pt_regs to it um: switch UPT_SET_RETURN_VALUE and regs_return_value to pt_regs um: set BLK_CGROUP=y in defconfig um: remove count_lock um: fully use tty_port um: Remove dead code um: remove line_ioctl() TTY: um/line, use tty from tty_port TTY: um/line, add tty_port		2012-08-01 16:45:02 -07:00
..
chan.h	um: switch close_chan() to struct line	2012-03-25 00:29:54 +01:00
chan_kern.c	TTY: um/line, use tty from tty_port	2012-07-28 17:47:58 +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
cow.h	um: switch cow_user.h to htobe{32,64}/betoh{32,64}	2012-04-10 00:13:45 +02: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
daemon.h
daemon_kern.c
daemon_user.c	um: -include user.h for USER_OBJ, trim includes	2011-11-02 14:14:44 +01:00
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	Merge branch 'for-linus-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml	2012-08-01 16:45:02 -07:00
line.h	um: remove count_lock	2012-07-28 17:47:59 +02:00
Makefile
mconsole.h	um: take mconsole*.h to arch/um/drivers	2011-11-02 14:15:12 +01:00
mconsole_kern.c	This patch series contains a major revamp of how we collect entropy	2012-07-31 19:07:42 -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
mmapper_kern.c
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
pcap_user.c	um: -include user.h for USER_OBJ, trim includes	2011-11-02 14:14:44 +01:00
pcap_user.h
port.h
port_kern.c	um: remove IRQF_SAMPLE_RANDOM which is now a no-op	2012-07-19 10:40:42 -04:00
port_user.c	um: -include user.h for USER_OBJ, trim includes	2011-11-02 14:14:44 +01:00
pty.c	um: -include user.h for USER_OBJ, trim includes	2011-11-02 14:14:44 +01:00
random.c	um: remove IRQF_SAMPLE_RANDOM which is now a no-op	2012-07-19 10:40:42 -04:00
slip.h
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
slirp.h
slirp_kern.c
slirp_user.c	um: -include user.h for USER_OBJ, trim includes	2011-11-02 14:14:44 +01:00
ssl.c	um: fully use tty_port	2012-07-28 17:47:59 +02:00
ssl.h
stderr_console.c
stdio_console.c	um: fully use tty_port	2012-07-28 17:47:59 +02:00
stdio_console.h
tty.c	um: -include user.h for USER_OBJ, trim includes	2011-11-02 14:14:44 +01:00
ubd.h	um: clean up the includes in ubd	2012-03-25 00:29:52 +01:00
ubd_kern.c	um: fix ubd_file_size for read-only files	2012-08-02 00:44:49 +02:00
ubd_user.c	um: clean up the includes in ubd	2012-03-25 00:29:52 +01:00
umcast.h
umcast_kern.c
umcast_user.c	um: -include user.h for USER_OBJ, trim includes	2011-11-02 14:14:44 +01:00
vde.h
vde_kern.c
vde_user.c	um: -include user.h for USER_OBJ, trim includes	2011-11-02 14:14:44 +01:00
xterm.c	um: -include user.h for USER_OBJ, trim includes	2011-11-02 14:14:44 +01:00
xterm.h
xterm_kern.c	um: remove IRQF_SAMPLE_RANDOM which is now a no-op	2012-07-19 10:40:42 -04:00