summaryrefslogtreecommitdiffstats
path: root/arch
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'proc' of git://git.kernel.org/pub/scm/linux/kernel/git/adobriya...Linus Torvalds2008-10-2312-99/+84
|\
| * proc: move /proc/stram to m68k-specific codeAlexey Dobriyan2008-10-231-6/+22
| * proc: move /proc/hardware to m68k-specific codeAlexey Dobriyan2008-10-239-86/+55
| * proc: switch /proc/meminfo to seq_fileAlexey Dobriyan2008-10-231-6/+5
* | Merge branch 'v28-range-hrtimers-for-linus-v2' of git://git.kernel.org/pub/sc...Linus Torvalds2008-10-235-16/+15
|\ \
| * \ Merge branch 'timers/range-hrtimers' into v28-range-hrtimers-for-linus-v2Thomas Gleixner2008-10-225-16/+15
| |\ \ | | |/ | |/|
| | * Merge commit 'linus/master' into merge-linusArjan van de Ven2008-10-172396-38784/+141719
| | |\
| | * | select: fix alpha OSF wrapperArjan van de Ven2008-10-061-6/+7
| | * | hrtimer: convert kvm-ia64 to the new hrtimer apisArjan van de Ven2008-09-051-1/+1
| | * | hrtimer: convert powerpc/oprofile to the new hrtimer apisArjan van de Ven2008-09-051-1/+1
| | * | hrtimer: convert kvm to the new hrtimer apisArjan van de Ven2008-09-052-7/+5
* | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6Linus Torvalds2008-10-2324-15/+6046
|\ \ \ \
| * \ \ \ Merge branches 'boards' and 'fixes' of git://git.kernel.org/pub/scm/linux/ker...Haavard Skinnemoen2008-10-232667-45086/+167136
| |\ \ \ \
| | * | | | avr32: Fix GPIO initcall breakageHaavard Skinnemoen2008-10-236-11/+12
| | * | | | avr32: Scale loops_per_jiffy when cpu frequency changesHaavard Skinnemoen2008-10-231-0/+14
| | * | | | avr32: Fix bug in LCD pin setup on port CAlex Raimondi2008-10-231-1/+1
| | |/ / /
| * | | | avr32: Add defconfig for the favr-32 boardHaavard Skinnemoen2008-10-141-0/+1235
| * | | | avr32: Add defconfig for the mimc200 boardHaavard Skinnemoen2008-10-131-0/+1109
| * | | | avr32: Add MIMC200 board supportMark Jackson2008-10-136-0/+466
| * | | | avr32: Fix MIMC200 board use of SPD network pinsMark Jackson2008-10-131-0/+4
| * | | | avr32: add support for EarthLCD Favr-32 boardHans-Christian Egtvedt2008-10-136-0/+479
| * | | | avr32: Add support for EVKLCD10X addon boardsHans-Christian Egtvedt2008-10-137-1/+2726
| * | | | avr32: Kconfig: Remove pointless if around atstk1000 includeHaavard Skinnemoen2008-10-131-2/+0
* | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/viro/bdevLinus Torvalds2008-10-231-10/+9
|\ \ \ \ \
| * | | | | [PATCH] switch ubdAl Viro2008-10-211-13/+12
| * | | | | [PATCH] beginning of methods conversionAl Viro2008-10-211-3/+3
| | |/ / / | |/| | |
* | | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds2008-10-233-10/+6
|\ \ \ \ \
| * | | | | [PATCH] prepare vfs_readdir() callers to returning filldir resultAl Viro2008-10-232-8/+4
| * | | | | [PATCH] don't pass bogus flags to LOOKUP_PARENT lookup in spufsAl Viro2008-10-231-2/+2
| |/ / / /
* | | | | Merge branch 'x86/um-header' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2008-10-23510-299/+42238
|\ \ \ \ \
| * | | | | x86: canonicalize remaining header guardsH. Peter Anvin2008-10-233-8/+8
| * | | | | x86: drop double underscores from header guardsH. Peter Anvin2008-10-2332-96/+96
| * | | | | x86: Fix ASM_X86__ header guardsH. Peter Anvin2008-10-22271-805/+805
| * | | | | x86, um: get rid of uml-config.hAl Viro2008-10-223-16/+17
| * | | | | x86, um: get rid of arch/um/Kconfig.archAl Viro2008-10-225-132/+131
| * | | | | x86, um: get rid of arch/um/os symlinkAl Viro2008-10-225-25/+4
| * | | | | x86, um: get rid of excessive includes of uml-config.hAl Viro2008-10-229-9/+0
| * | | | | x86, um: get rid of header symlinksAl Viro2008-10-2250-19/+5
| * | | | | x86, um: merge Kconfig.i386 and Kconfig.x86_64Al Viro2008-10-224-57/+23
| * | | | | x86, um: get rid of sysdep symlinkAl Viro2008-10-2241-10/+2
| * | | | | x86, um: trim the junk from uml ptrace-*.hAl Viro2008-10-222-15/+2
| * | | | | x86, um: take vm-flags.h to sysdepAl Viro2008-10-224-3/+2
| * | | | | x86, um: get rid of uml asm/archAl Viro2008-10-222-18/+2
| * | | | | x86, um: get rid of uml highmem.hAl Viro2008-10-224-17/+14
| * | | | | x86, um: get rid of uml unistd.hAl Viro2008-10-225-41/+4
| * | | | | x86, um: get rid of system.h -> system.h includeAl Viro2008-10-227-55/+266
| * | | | | x86, um: uml atomic.h is not needed anymoreAl Viro2008-10-221-11/+0
| * | | | | x86, um: untangle uml ldt.hAl Viro2008-10-229-9/+9
| * | | | | x86, um: get rid of more uml asm/arch usesAl Viro2008-10-223-3/+3
| * | | | | x86, um: remove dead header (uml module-generic.h; never used these days)Al Viro2008-10-221-6/+0