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-03-213-22/+16
|\
| * um: uml_dup_mmap() relies on ->mmap_sem being held, but activate_mm() doesn't...Al Viro2012-03-202-3/+10
| * um: embed ->stub_pages[] into mmu_contextAl Viro2012-03-202-19/+6
* | Merge branch 'kmap_atomic' of git://github.com/congwang/linuxLinus Torvalds2012-03-211-2/+2
|\ \
| * | um: remove the second argument of k[un]map_atomic()Cong Wang2012-03-201-2/+2
| |/
* / UML net: set addr_assign_type if random_ether_addr() usedDanny Kukawka2012-02-171-3/+8
|/
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds2012-01-171-11/+9
|\
| * audit: inline audit_syscall_entry to reduce burden on archsEric Paris2012-01-171-11/+9
| * Audit: push audit success and retcode into arch ptrace.hEric Paris2012-01-171-2/+2
* | Merge branch 'x86-syscall-for-linus' of git://git.kernel.org/pub/scm/linux/ke...Linus Torvalds2012-01-161-2/+7
|\ \ | |/ |/|
| * um: Use $(srctree) not $(KBUILD_SRC)H. Peter Anvin2011-12-091-1/+1
| * um: Generate headers before generating user-offsets.sH. Peter Anvin2011-12-051-1/+1
| * um: Run host archheaders, allow use of host generated headersH. Peter Anvin2011-12-051-1/+6
* | cpu: Register a generic CPU device on architectures that currently do notBen Hutchings2012-01-111-0/+1
* | Merge branch 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2012-01-081-2/+0
|\ \
| * | freezer: remove now unused TIF_FREEZETejun Heo2011-11-211-2/+0
| |/
* | Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/ke...Linus Torvalds2012-01-061-4/+2
|\ \
| * \ Merge branch 'fortglx/3.3/tip/timers/core' of git://git.linaro.org/people/jst...Thomas Gleixner2011-12-051-4/+2
| |\ \ | | |/ | |/|
| | * clocksource: um: Convert to clocksource_register_hz/khzJohn Stultz2011-11-211-4/+2
* | | nohz: Remove tick_nohz_idle_enter_norcu() / tick_nohz_idle_exit_norcu()Frederic Weisbecker2011-12-111-2/+4
* | | nohz: Allow rcu extended quiescent state handling seperately from tick stopFrederic Weisbecker2011-12-111-2/+2
* | | nohz: Separate out irq exit and idle loop dyntick logicFrederic Weisbecker2011-12-111-2/+2
|/ /
* | Merge branch 'for-linus' of git://github.com/richardweinberger/linuxLinus Torvalds2011-11-02224-8590/+340
|\ \
| * | um: fix ubd cow sizeRichard Weinberger2011-11-021-1/+30
| * | um: switch to use of drivers/KconfigAl Viro2011-11-021-22/+1
| * | um: distribute exports to where exported stuff is definedAl Viro2011-11-0210-54/+40
| * | um: kill system-um.hAl Viro2011-11-022-46/+37
| * | um: generic ftrace.h will do...Al Viro2011-11-022-1/+1
| * | um: segment.h is x86-only and needed only thereAl Viro2011-11-021-10/+0
| * | um: asm/pda.h is not needed anymoreAl Viro2011-11-021-21/+0
| * | um: hw_irq.h can go generic as wellAl Viro2011-11-022-8/+1
| * | um: switch to generic-yAl Viro2011-11-0213-59/+2
| * | um: clean Kconfig up a bitAl Viro2011-11-022-113/+7
| * | um: kill useless argument of free_chan() and free_one_chan()Al Viro2011-11-021-5/+5
| * | um: unify ptrace_user.hAl Viro2011-11-023-8/+7
| * | um: fix gcov build breakageAl Viro2011-11-021-15/+0
| * | um: page_offset.h is never usedAl Viro2011-11-021-1/+0
| * | um: irq_vectors.h just shadows x86 oneAl Viro2011-11-021-10/+0
| * | um: required-features.h is there only to shadow x86 one...Al Viro2011-11-021-9/+0
| * | um: asm/apic.h is there only to shadow the x86 one...Al Viro2011-11-021-4/+0
| * | um: take ubd_user.h to its users...Al Viro2011-11-021-0/+0
| * | um: take ldt.h to arch/x86/um/asm/mm_context.hAl Viro2011-11-022-39/+2
| * | um: merge os-Linux/tls.c into arch/x86/um/os-Linux/tls.cAl Viro2011-11-023-42/+2
| * | um: move asm/desc.h into arch/x86/um/asmAl Viro2011-11-021-16/+0
| * | um: take um_mmu.h to asm/mmu.h, clean asm/mmu_context.h a bitAl Viro2011-11-023-34/+19
| * | um: kill um_uaccess.hAl Viro2011-11-022-99/+84
| * | um: take mconsole*.h to arch/um/driversAl Viro2011-11-022-0/+0
| * | um: take chan_*.h and line.h to arch/um/driversAl Viro2011-11-028-10/+8
| * | um: take register_winch_irq() into the caller of is_skas_winch()Al Viro2011-11-022-6/+7
| * | um: kill shared/mem_kern.hAl Viro2011-11-022-21/+0