summaryrefslogtreecommitdiffstats
path: root/arch/um
Commit message (Expand)AuthorAgeFilesLines
* 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
| | |/ | |/|
* | | 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
|\ \ \
| * | | um: remove km_type definitionsCong Wang2012-07-241-17/+1
| | |/ | |/|
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2012-07-191-1/+0
|\| |
| * | Revert "rcu: Move PREEMPT_RCU preemption to switch_to() invocation"Paul E. McKenney2012-07-021-1/+0
| |/
* / arch: Use eth_random_addrJoe Perches2012-07-161-1/+1
|/
* new helper: signal_delivered()Al Viro2012-06-011-1/+1
* most of set_current_blocked() callers want SIGKILL/SIGSTOP removed from setAl Viro2012-06-012-7/+0
* pull clearing RESTORE_SIGMASK into block_sigmask()Al Viro2012-06-011-14/+2
* new helper: sigmask_to_save()Al Viro2012-06-011-8/+3
* new helper: restore_saved_sigmask()Al Viro2012-06-011-4/+2
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds2012-05-311-4/+1
|\
| * move key_repace_session_keyring() into tracehook_notify_resume()Al Viro2012-05-231-4/+1
* | um: properly check all process' threads for a live mmAnton Vorontsov2012-05-311-6/+7
* | um: fix possible race on task->mmAnton Vorontsov2012-05-311-2/+5
* | um: should hold tasklist_lock while traversing processesAnton Vorontsov2012-05-311-0/+3
* | um/kernel/trap.c: port OOM changes to handle_page_fault()Kautuk Consul2012-05-311-5/+19
* | Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek...Linus Torvalds2012-05-281-9/+2
|\ \
| * | kbuild: link of vmlinux moved to a scriptSam Ravnborg2012-05-051-9/+2