summaryrefslogtreecommitdiffstats
path: root/arch/um
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2009-08-124-8/+8
|\
| * mm: Pass virtual address to [__]p{te,ud,md}_free_tlb()Benjamin Herrenschmidt2009-07-272-5/+5
| * sched: INIT_PREEMPT_COUNTPeter Zijlstra2009-07-101-1/+1
| * Remove multiple KERN_ prefixes from printk formatsJoe Perches2009-07-081-2/+2
* | net: use NETDEV_TX_OK instead of 0 in ndo_start_xmit() functionsPatrick McHardy2009-07-051-1/+1
|/
* UML: Fix some apparent bitrotPaul Menage2009-06-253-4/+2
* Move FAULT_FLAG_xyz into handle_mm_fault() callersLinus Torvalds2009-06-211-1/+1
* Merge branch 'akpm'Linus Torvalds2009-06-167-32/+29
|\
| * fbdev: move logo externs to header fileGeert Uytterhoeven2009-06-161-1/+1
| * uml: bad macro expansion, parameter is memberRoel Kluin2009-06-161-22/+22
| * uml: fix a section warningAmerigo Wang2009-06-162-2/+2
| * um: remove obsolete hw_interrupt_typeThomas Gleixner2009-06-161-3/+3
| * uml: UML net driver does not allow for vlansAlan Cox2009-06-161-1/+1
| * mm: consolidate init_mm definitionAlexey Dobriyan2009-06-161-3/+0
* | uml: remove driver_data direct access of struct deviceGreg Kroah-Hartman2009-06-152-4/+4
|/
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arn...Linus Torvalds2009-06-121-1/+1
|\
| * asm-generic: merge branch 'master' of torvalds/linux-2.6Arnd Bergmann2009-06-121-29/+7
| |\
| * | asm-generic: rename page.h and uaccess.hArnd Bergmann2009-06-111-1/+1
* | | PM: Remove unused asm/suspend.hMagnus Damm2009-06-121-4/+0
* | | module: merge module_alloc() finallyAmerigo Wang2009-06-121-1/+6
* | | uml module: fix uml build process due to this mergeAmerigo Wang2009-06-123-25/+2
| |/ |/|
* | block: implement and enforce request peek/start/fetchTejun Heo2009-05-111-2/+1
* | block: convert to pos and nr_sectors accessorsTejun Heo2009-05-111-1/+1
* | ubd: drop unnecessary rq->sector manipulationTejun Heo2009-04-281-5/+5
* | ubd: cleanup completion pathTejun Heo2009-04-281-22/+1
|/
* uml: kill a kconfig warningWANG Cong2009-04-211-1/+1
* clocksource: pass clocksource to read() callbackMagnus Damm2009-04-211-1/+1
* Merge branch 'tracing-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...Linus Torvalds2009-04-051-0/+1
|\
| * Merge branch 'tracing/core-v2' into tracing-for-linusIngo Molnar2009-04-021-0/+1
| |\
| | * Merge branch 'core/locking' into tracing/ftraceIngo Molnar2009-03-132-1/+9
| | |\
| | * | tracing: make CALLER_ADDRx overwriteableUwe Kleine-Koenig2009-03-021-0/+1
* | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/linux-hdreg-h-cleanupLinus Torvalds2009-04-031-6/+6
|\ \ \ \
| * | | | ubd_kern: make it 'struct hd_driveid'-freeBartlomiej Zolnierkiewicz2009-04-011-6/+6
| |/ / /
* | | | Simplify copy_thread()Alexey Dobriyan2009-04-021-1/+1
* | | | uml: fix warnings in kernel_execveMiklos Szeredi2009-04-021-1/+2
* | | | uml: fix link error from prefixing of i386 syscalls with ptregs_Miklos Szeredi2009-04-021-0/+11
* | | | uml: fix compile error from net_device_ops conversionMiklos Szeredi2009-04-021-1/+1
|/ / /
* | | uml: remove useless commentsWANG Cong2009-04-0131-310/+0
* | | uml: improve error messagesWANG Cong2009-04-011-4/+4
* | | uml: don't use a too long string literalWANG Cong2009-04-012-5/+9
* | | ubd: stop defintining MAJOR_NRChristoph Hellwig2009-04-011-9/+8
* | | uml: convert network device to netdevice opsStephen Hemminger2009-03-271-7/+13
* | | uml: convert network device to internal network device statsStephen Hemminger2009-03-272-14/+7
| | |
| \ \
*-. \ \ Merge branches 'irq/genirq' and 'linus' into irq/coreIngo Molnar2009-03-163-4/+12
|\ \ \ \ | | |/ / | |/| / | | |/
| | * uml: fix WARNING: vmlinux: 'memcpy' exported twiceakpm@linux-foundation.org2009-03-121-1/+4
| | * UML on UML fixed: it did not startRenzo Davoli2009-03-121-0/+5
| |/
| * uml: fix vde network backend in user mode linuxLuca Bigliardi2009-02-201-3/+3
* | sparseirq: use kstat_irqs_cpu insteadYinghai Lu2009-01-111-1/+1
|/
* mm: invoke oom-killer from page faultNick Piggin2009-01-061-16/+8
* uml got broken by commit 30742d5c2277c325fb0e9d2d817d55a19995fe8fAl Viro2009-01-051-7/+7