summaryrefslogtreecommitdiffstats
path: root/arch/um
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds2012-10-121-3/+0
|\
| * sanitize tsk_is_polling()Al Viro2012-10-011-3/+0
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds2012-10-105-57/+5
|\ \ | |/
| * um: switch to generic kernel_thread()Al Viro2012-09-302-16/+3
| * x86, um/x86: switch to generic sys_execve and kernel_execveAl Viro2012-09-303-41/+2
| * um: kill thread->forkingAl Viro2012-09-203-25/+16
| * um: let signal_delivered() do SIGTRAP on singlestepping into handlerAl Viro2012-09-201-1/+5
| * um: don't leak floating point state and segment registers on execve()Al Viro2012-09-201-0/+1
| * um: take cleaning singlestep to start_thread()Al Viro2012-09-201-19/+5
* | Merge branch 'for-linus-37rc1' of git://git.kernel.org/pub/scm/linux/kernel/g...Linus Torvalds2012-10-10122-383/+383
|\ \
| * | um: get rid of pointless include "..." where include <...> will doAl Viro2012-10-09120-382/+382
| * | um: move sysrq.h out of include/sharedAl Viro2012-10-092-1/+1
* | | Merge branch 'akpm' (Andrew's patch-bomb)Linus Torvalds2012-10-092-0/+2
|\ \ \
| * | | readahead: fault retry breaks mmap file read random detectionShaohua Li2012-10-091-0/+1
| * | | Kconfig: clean up the long arch list for the UID16 config optionCatalin Marinas2012-10-091-0/+1
* | | | Merge branch 'disintegrate-asm-generic' of git://git.infradead.org/users/dhow...Arnd Bergmann2012-10-043-80/+27
|\ \ \ \ | |/ / /
| * | | Merge tag 'uapi-prep-20121002' of git://git.infradead.org/users/dhowells/linu...Linus Torvalds2012-10-031-1/+3
| |\ \ \
| | * | | UAPI: Partition the header include path sets and add uapi/ header directoriesDavid Howells2012-10-021-1/+3
| * | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds2012-10-021-78/+21
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | um: resurrect the right variant of mconsole_proc()Al Viro2012-09-261-78/+21
| | | |/ | | |/|
| * | | Merge tag 'tty-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/ttyLinus Torvalds2012-10-011-1/+2
| |\ \ \
| | * \ \ Merge 3.6-rc6 into tty-nextGreg Kroah-Hartman2012-09-161-1/+1
| | |\ \ \ | | | |/ /
| | * | | TTY: use tty_port_register_deviceJiri Slaby2012-08-131-1/+2
| * | | | Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kerne...Linus Torvalds2012-10-011-0/+1
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | rcu: Switch task's syscall hooks on context switchFrederic Weisbecker2012-09-261-0/+1
| | | |/ | | |/|
* | | | asm-generic: Add default clkdev.hMark Brown2012-10-031-1/+1
|/ / /
* | | um: Preinclude include/linux/kern_levels.hGeert Uytterhoeven2012-09-273-11/+12
* | | um: kill thread->forkingAl Viro2012-09-273-25/+16
* | | um: let signal_delivered() do SIGTRAP on singlestepping into handlerAl Viro2012-09-271-1/+5
* | | um: don't leak floating point state and segment registers on execve()Al Viro2012-09-271-0/+1
* | | um: take cleaning singlestep to start_thread()Al Viro2012-09-271-19/+5
|/ /
* | uml: fix compile error in deliver_alarm()Miklos Szeredi2012-09-051-1/+1
|/
* Merge branch 'for-linus-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel...Linus Torvalds2012-08-0121-299/+202
|\
| * um: pass siginfo to guest processMartin Pärtel2012-08-0210-34/+71
| * um: fix ubd_file_size for read-only filesMartin Pärtel2012-08-021-1/+1
| * um: pull interrupt_end() into userspace()Al Viro2012-08-022-8/+6
| * um: split syscall_trace(), pass pt_regs to itAl Viro2012-08-023-43/+34
| * um: switch UPT_SET_RETURN_VALUE and regs_return_value to pt_regsAl Viro2012-08-012-2/+2
| * um: set BLK_CGROUP=y in defconfigRichard Weinberger2012-07-281-1/+1
| * um: remove count_lockRichard Weinberger2012-07-282-7/+0
| * um: fully use tty_portRichard Weinberger2012-07-284-78/+65
| * um: Remove dead codeRichard Weinberger2012-07-281-26/+0
| * um: remove line_ioctl()Richard Weinberger2012-07-284-90/+0
| * TTY: um/line, use tty from tty_portJiri Slaby2012-07-283-9/+21
| * TTY: um/line, add tty_portJiri Slaby2012-07-282-4/+5
* | Merge branch 'akpm' (Andrew's patch-bomb)Linus Torvalds2012-07-311-4/+4
|\ \
| * | memcg: rename config variablesAndrew Morton2012-07-311-4/+4
* | | Merge tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2012-07-316-19/+12
|\ \ \ | |/ / |/| |
| * | um: remove IRQF_SAMPLE_RANDOM which is now a no-opTheodore Ts'o2012-07-196-19/+12
* | | Merge branch 'kmap_atomic' of git://github.com/congwang/linuxLinus Torvalds2012-07-271-17/+1
|\ \ \
OpenPOWER on IntegriCloud