37224470c8
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (65 commits) ACPI: suppress power button event on S3 resume ACPI: resolve merge conflict between sem2mutex and processor_perflib.c ACPI: use for_each_possible_cpu() instead of for_each_cpu() ACPI: delete newly added debugging macros in processor_perflib.c ACPI: UP build fix for bugzilla-5737 Enable P-state software coordination via _PDC P-state software coordination for speedstep-centrino P-state software coordination for acpi-cpufreq P-state software coordination for ACPI core ACPI: create acpi_thermal_resume() ACPI: create acpi_fan_suspend()/acpi_fan_resume() ACPI: pass pm_message_t from acpi_device_suspend() to root_suspend() ACPI: create acpi_device_suspend()/acpi_device_resume() ACPI: replace spin_lock_irq with mutex for ec poll mode ACPI: Allow a WAN module enable/disable on a Thinkpad X60. sem2mutex: acpi, acpi_link_lock ACPI: delete unused acpi_bus_drivers_lock sem2mutex: drivers/acpi/processor_perflib.c ACPI add ia64 exports to build acpi_memhotplug as a module ACPI: asus_acpi_init(): propagate correct return value ... Manual resolve of conflicts in: arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c include/acpi/processor.h |
||
---|---|---|
.. | ||
mach-bigsmp | ||
mach-default | ||
mach-es7000 | ||
mach-generic | ||
mach-numaq | ||
mach-summit | ||
mach-visws | ||
mach-voyager | ||
8253pit.h | ||
a.out.h | ||
acpi.h | ||
agp.h | ||
alternative.h | ||
apic.h | ||
apicdef.h | ||
arch_hooks.h | ||
atomic.h | ||
auxvec.h | ||
bitops.h | ||
boot.h | ||
bug.h | ||
bugs.h | ||
byteorder.h | ||
cache.h | ||
cacheflush.h | ||
checksum.h | ||
cpu.h | ||
cpufeature.h | ||
cputime.h | ||
current.h | ||
debugreg.h | ||
delay.h | ||
desc.h | ||
div64.h | ||
dma-mapping.h | ||
dma.h | ||
dmi.h | ||
e820.h | ||
edac.h | ||
elf.h | ||
emergency-restart.h | ||
errno.h | ||
fcntl.h | ||
fixmap.h | ||
floppy.h | ||
futex.h | ||
genapic.h | ||
hardirq.h | ||
highmem.h | ||
hpet.h | ||
hw_irq.h | ||
i387.h | ||
i8253.h | ||
i8259.h | ||
ide.h | ||
io.h | ||
io_apic.h | ||
ioctl.h | ||
ioctls.h | ||
ipc.h | ||
ipcbuf.h | ||
irq.h | ||
ist.h | ||
kdebug.h | ||
kexec.h | ||
kmap_types.h | ||
kprobes.h | ||
ldt.h | ||
linkage.h | ||
local.h | ||
math_emu.h | ||
mc146818rtc.h | ||
mca.h | ||
mca_dma.h | ||
mce.h | ||
mman.h | ||
mmu.h | ||
mmu_context.h | ||
mmx.h | ||
mmzone.h | ||
module.h | ||
mpspec.h | ||
mpspec_def.h | ||
msgbuf.h | ||
msi.h | ||
msr.h | ||
mtrr.h | ||
mutex.h | ||
namei.h | ||
nmi.h | ||
node.h | ||
numa.h | ||
numaq.h | ||
page.h | ||
param.h | ||
parport.h | ||
pci-direct.h | ||
pci.h | ||
percpu.h | ||
pgalloc.h | ||
pgtable-2level-defs.h | ||
pgtable-2level.h | ||
pgtable-3level-defs.h | ||
pgtable-3level.h | ||
pgtable.h | ||
poll.h | ||
posix_types.h | ||
processor.h | ||
ptrace.h | ||
resource.h | ||
rtc.h | ||
rwlock.h | ||
rwsem.h | ||
scatterlist.h | ||
seccomp.h | ||
sections.h | ||
segment.h | ||
semaphore.h | ||
sembuf.h | ||
serial.h | ||
setup.h | ||
shmbuf.h | ||
shmparam.h | ||
sigcontext.h | ||
siginfo.h | ||
signal.h | ||
smp.h | ||
socket.h | ||
sockios.h | ||
sparsemem.h | ||
spinlock.h | ||
spinlock_types.h | ||
srat.h | ||
stat.h | ||
statfs.h | ||
string.h | ||
suspend.h | ||
system.h | ||
termbits.h | ||
termios.h | ||
thread_info.h | ||
timer.h | ||
timex.h | ||
tlb.h | ||
tlbflush.h | ||
topology.h | ||
types.h | ||
uaccess.h | ||
ucontext.h | ||
unaligned.h | ||
unistd.h | ||
user.h | ||
vga.h | ||
vic.h | ||
vm86.h | ||
voyager.h | ||
xor.h |