summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'x86/um-header' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2008-10-23593-1760/+1336
|\
| * 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-23271-805/+805
| * x86, um: get rid of uml-config.hAl Viro2008-10-233-16/+17
| * x86, um: get rid of arch/um/Kconfig.archAl Viro2008-10-237-133/+136
| * x86, um: get rid of arch/um/os symlinkAl Viro2008-10-235-25/+4
| * x86, um: get rid of excessive includes of uml-config.hAl Viro2008-10-239-9/+0
| * x86, um: get rid of header symlinksAl Viro2008-10-2350-19/+5
| * x86, um: merge Kconfig.i386 and Kconfig.x86_64Al Viro2008-10-234-57/+23
| * x86, um: get rid of sysdep symlinkAl Viro2008-10-2341-10/+2
| * x86, um: trim the junk from uml ptrace-*.hAl Viro2008-10-232-15/+2
| * x86, um: take vm-flags.h to sysdepAl Viro2008-10-234-3/+2
| * x86, um: get rid of uml asm/archAl Viro2008-10-232-18/+2
| * x86, um: get rid of uml highmem.hAl Viro2008-10-234-17/+14
| * x86, um: get rid of uml unistd.hAl Viro2008-10-235-41/+4
| * x86, um: get rid of system.h -> system.h includeAl Viro2008-10-237-55/+266
| * x86, um: uml atomic.h is not needed anymoreAl Viro2008-10-231-11/+0
| * x86, um: untangle uml ldt.hAl Viro2008-10-239-9/+9
| * x86, um: get rid of more uml asm/arch usesAl Viro2008-10-233-3/+3
| * x86, um: remove dead header (uml module-generic.h; never used these days)Al Viro2008-10-231-6/+0
| * x86, um: get rid of uml signal.hAl Viro2008-10-233-30/+2
| * x86, um: sanitize uml sigcontext.h usesAl Viro2008-10-237-71/+2
| * x86, um: now we can get rid of trivial uml headersAl Viro2008-10-2360-371/+2
| * x86, um: ... and asm-x86 moveAl Viro2008-10-23340-11/+11
| * x86, um: initial part of asm-um moveAl Viro2008-10-23145-8/+9
| * x86, um: take arch/um/include/* out of the wayAl Viro2008-10-2379-27/+26
* | Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/...Linus Torvalds2008-10-23145-2212/+5917
|\ \
| * | dock: make dock driver not a moduleShaohua Li2008-10-231-1/+1
| * | ACPI: fix ia64 build warningLen Brown2008-10-231-1/+1
| * | Merge branch 'bugzilla-11715' into testLen Brown2008-10-231-3/+52
| |\ \
| | * | x86: SB600: skip ACPI IRQ0 override if it is not routed to INT2 of IOAPICAndreas Herrmann2008-10-161-3/+52
| * | | ACPI: hack around sysfs warning with link orderZhao Yakui2008-10-231-1/+1
| * | | ACPI suspend: fix build warning when CONFIG_ACPI_SLEEP=nLen Brown2008-10-231-1/+1
| * | | intel_menlo: fix build warningLen Brown2008-10-231-1/+1
| * | | Merge branch 'linus' into testLen Brown2008-10-237289-186826/+577351
| |\ \ \ | | | |/ | | |/|
| * | | panasonic-laptop: fix buildLen Brown2008-10-231-3/+3
| * | | Merge branch 'panasonic' into testLen Brown2008-10-234-0/+784
| |\ \ \
| | * | | panasonic-laptop: depends on ACPIRandy Dunlap2008-10-231-1/+1
| | * | | panasonic-laptop: add Panasonic Let's Note laptop extras driver v0.94Harald Welte2008-09-244-0/+784
| * | | | Merge branch 'yinghai' into testLen Brown2008-10-232-8/+3
| |\ \ \ \
| | * | | | ACPI: remove unused have_arch_parse_sratYinghai Lu2008-10-111-8/+0
| | * | | | ACPI: don't load acpi_cpufreq if acpi=offYinghai Lu2008-10-111-0/+3
| * | | | | Merge branch 'ull' into testLen Brown2008-10-2330-110/+123
| |\ \ \ \ \
| | * | | | | ACPI: Change acpi_evaluate_integer to support 64-bit on 32-bit kernelsMatthew Wilcox2008-10-1132-112/+125
| | |/ / / /
| * | | | | Merge branch 'thinkpad' into testLen Brown2008-10-231-2/+61
| |\ \ \ \ \
| | * | | | | ACPI: thinkpad-acpi: Remove firmware backlight delays for Intel ACPI IGD OpRe...Henrique de Moraes Holschuh2008-10-231-0/+11
| | * | | | | ACPI: thinkpad-acpi: Remove duplicate linePascal Terjan2008-10-231-1/+0
| | * | | | | ACPI: thinkpad-acpi: trivial fix of error messageMariusz Kozlowski2008-10-231-1/+2
| | * | | | | ACPI: thinkpad-acpi: attempt to preserve fan state on resumeHenrique de Moraes Holschuh2008-10-231-0/+48
| | |/ / / /