summaryrefslogtreecommitdiffstats
path: root/arch/um
Commit message (Expand)AuthorAgeFilesLines
* 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
| | * um: wrong sigmask saved in case of multiple sigframesAl Viro2012-05-211-6/+5
| | * um: add TIF_NOTIFY_RESUMEAl Viro2012-05-212-1/+8
| | * um: ->restart_block.fn needs to be reset on sigreturnAl Viro2012-05-211-3/+0
| * | um: Remove CONFIG_IRQ_RELEASE_METHODRichard Weinberger2012-05-212-6/+0
| * | um: Remove usage of irq_chip->release()Richard Weinberger2012-05-211-2/+0
| * | um: Implement um_free_irq()Richard Weinberger2012-05-217-10/+18
| * | um: Fix __swp_type()Richard Weinberger2012-05-211-2/+2
| * | um: Implement a custom pte_same() functionRichard Weinberger2012-05-211-0/+6
| * | um: Add BUG() to do_ops()'s error pathRichard Weinberger2012-05-211-0/+1
| * | um: Remove unused variablesRichard Weinberger2012-05-211-10/+0
| |/
* | Merge branch 'smp-hotplug-for-linus' of git://git.kernel.org/pub/scm/linux/ke...Linus Torvalds2012-05-215-42/+7
|\ \
| * | um: Remove leftover declaration of alloc_task_struct_node()Thomas Gleixner2012-05-081-2/+0
| * | init_task: Replace CONFIG_HAVE_GENERIC_INIT_TASKThomas Gleixner2012-05-051-1/+0
| * | um: Use generic init_taskThomas Gleixner2012-05-054-39/+7
| * | smp: Add task_struct argument to __cpu_up()Thomas Gleixner2012-04-261-1/+1
| |/
* / rcu: Move PREEMPT_RCU preemption to switch_to() invocationPaul E. McKenney2012-05-021-0/+1
|/
* um: uml_setup_stubs': warning: unused variable 'pages'Boaz Harrosh2012-04-101-1/+0
* um: Use asm-generic/switch_to.hRichard Weinberger2012-04-102-5/+2
* um: Disintegrate asm/system.hRichard Weinberger2012-04-102-1/+2
* um: switch cow_user.h to htobe{32,64}/betoh{32,64}Al Viro2012-04-102-57/+21
* um: fix linker script generationAl Viro2012-04-091-3/+4
* remove references to cpu_*_map in arch/Rusty Russell2012-03-292-6/+5
* Merge tag 'split-asm_system_h-for-linus-20120328' of git://git.kernel.org/pub...Linus Torvalds2012-03-281-1/+0
|\
| * Remove all #inclusions of asm/system.hDavid Howells2012-03-281-1/+0
* | Merge branch 'for-linus-3.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel...Linus Torvalds2012-03-2739-699/+781
|\ \
| * | um: Update defconfigRichard Weinberger2012-03-251-184/+471
| * | um: Switch to large mcmodel on x86_64Richard Weinberger2012-03-251-0/+1
| * | um: Wire CONFIG_GENERIC_IO upRichard Weinberger2012-03-251-0/+1
| * | um: Serve io_remap_pfn_range()Richard Weinberger2012-03-251-0/+2
| * | um: most of the SUBARCH uses can be killedAl Viro2012-03-252-3/+3
| * | um: deadlock in line_write_interrupt()Al Viro2012-03-251-0/+1
| * | um: don't bother trying to rebuild CHECKFLAGS for USER_OBJSAl Viro2012-03-251-4/+3
| * | um: use the right ifdef around exports in user_syms.cAl Viro2012-03-252-3/+1
| * | um: a bunch of headers can be killed by using generic-yAl Viro2012-03-257-124/+1
| * | um: ptrace-generic.h doesn't need user.hAl Viro2012-03-251-1/+0
| * | um: kill HOST_TASK_PIDAl Viro2012-03-253-5/+3
| * | um: remove pointless include of asm/fixmap.h from asm/pgtable.hAl Viro2012-03-251-2/+1
| * | um: asm-offsets.h might as well come from underlying arch...Al Viro2012-03-251-1/+0
| * | um: switch close_chan() to struct lineAl Viro2012-03-253-9/+11
| * | um: race fix: initialize delayed_work *before* registering IRQAl Viro2012-03-253-18/+15
| * | um: line->have_irq is never checked...Al Viro2012-03-252-2/+0
| * | um: chan_init_pri is dead nowAl Viro2012-03-251-2/+0
| * | um: switch users of ->chan_list to ->chan_{in,out} (easy cases)Al Viro2012-03-255-128/+88
| * | um: sorting out the chan mess, part 1Al Viro2012-03-252-0/+5
| * | um: finally kill ->init_str leaksAl Viro2012-03-251-1/+3
| * | um: get rid of lines_init()Al Viro2012-03-254-46/+33