Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Documentation/kernel-parameters.txt

Documentation/sound/alsa/ALSA-Configuration.txt

Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl

arch/i386/kernel/acpi/Makefile

arch/i386/kernel/acpi/boot.c

arch/i386/kernel/acpi/cstate.c

arch/i386/kernel/acpi/processor.c

arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c

arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c

arch/i386/kernel/mpparse.c

arch/ia64/kernel/Makefile

arch/ia64/kernel/acpi-ext.c

arch/ia64/kernel/acpi-processor.c

arch/ia64/kernel/acpi.c

arch/ia64/kernel/cpufreq/Makefile

arch/ia64/kernel/cpufreq/acpi-cpufreq.c

arch/ia64/pci/pci.c

arch/powerpc/platforms/pseries/pci_dlpar.c

arch/x86_64/kernel/acpi/Makefile

arch/x86_64/kernel/acpi/processor.c