summaryrefslogtreecommitdiffstats
path: root/arch/um
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvmLinus Torvalds2012-05-241-0/+1
|\ \ \
| * \ \ Merge branch 'linus' into queueMarcelo Tosatti2012-04-197-67/+29
| |\ \ \
| * | | | kvmclock: Add functions to check if the host has stopped the vmEric B Munson2012-04-081-0/+1
* | | | | Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/ke...Linus Torvalds2012-05-242-5/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | timers: Fixup the Kconfig consolidation falloutThomas Gleixner2012-05-211-1/+0
| * | | | um: Use generic time configAnna-Maria Gleixner2012-05-211-4/+1
| | |/ / | |/| |
* | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds2012-05-231-8/+1
|\ \ \ \
| * | | | new helper: sigsuspend()Al Viro2012-05-211-8/+1
* | | | | Merge branch 'x86-fpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...Linus Torvalds2012-05-231-5/+0
|\ \ \ \ \
| * | | | | fork: move the real prepare_to_copy() users to arch_dup_task_struct()Suresh Siddha2012-05-161-5/+0
| | |/ / / | |/| | |
* | | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/umlLinus Torvalds2012-05-2316-43/+42
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Merge branch 'for-um' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/s...Richard Weinberger2012-05-214-13/+15
| |\ \ \ \
| | * | | | um/x86: merge (and trim) 32- and 64-bit variants of ptrace.hAl Viro2012-05-212-2/+2
| | * | | | um: bury unused _TIF_RESTORE_SIGMASKAl Viro2012-05-211-1/+0