Linus Torvalds 37224470c8 Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 ... * '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		2006-06-23 07:52:36 -07:00
..
mach-bigsmp
mach-default	[PATCH] RTC: Fix up some RTC whitespace and style	2006-03-28 09:16:01 -08:00
mach-es7000	[PATCH] Compilation fix for ES7000 when no ACPI is specified in config (i386)	2006-03-23 07:38:04 -08:00
mach-generic
mach-numaq
mach-summit	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
mach-visws	[PATCH] i386: fix uses of user_mode() vs. user_mode_vm()	2006-03-23 07:38:05 -08:00
mach-voyager	[PATCH] i386: fix uses of user_mode() vs. user_mode_vm()	2006-03-23 07:38:05 -08:00
8253pit.h
a.out.h
acpi.h	[PATCH] don't call check_acpi_pci() on x86 with ACPI disabled	2006-03-22 07:53:54 -08:00
agp.h
alternative.h	[PATCH] x86: compile fix for asm-i386/alternatives.h	2006-06-23 07:42:59 -07:00
apic.h	[PATCH] arch/i386/kernel/apic.c: make modern_apic() static	2006-06-23 07:42:56 -07:00
apicdef.h	x86_64: Remove stale lapic definition from apicdef.h	2006-04-01 22:50:03 -05:00
arch_hooks.h	[PATCH] x86: early printk handling fixes	2006-03-23 07:38:05 -08:00
atomic.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
auxvec.h
bitops.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
boot.h
bug.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
bugs.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
byteorder.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
cache.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
cacheflush.h
checksum.h
cpu.h
cpufeature.h	[PATCH] x86: VIA C7 CPU flags	2006-06-23 07:42:59 -07:00
cputime.h
current.h
debugreg.h
delay.h
desc.h	[PATCH] x86: fix broken SMP boot sequence	2006-02-24 14:31:38 -08:00
div64.h
dma-mapping.h
dma.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
dmi.h	[PATCH] x86_64: Implement early DMI scanning	2006-03-25 09:10:55 -08:00
e820.h	[PATCH] x86_64: Introduce e820_all_mapped	2006-04-09 11:53:50 -07:00
edac.h
elf.h
emergency-restart.h
errno.h
fcntl.h
fixmap.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
floppy.h	[PATCH] Remove long dead i386 floppy asm code	2006-03-31 12:18:50 -08:00
futex.h	[PATCH] lightweight robust futexes updates	2006-03-27 08:44:49 -08:00
genapic.h
hardirq.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
highmem.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
hpet.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
hw_irq.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
i387.h	[PATCH] i386: fix broken FP exception handling	2006-04-29 14:13:16 -07:00
i8253.h
i8259.h
ide.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
io_apic.h	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6	2006-05-24 09:22:21 +01:00
io.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
ioctl.h
ioctls.h
ipc.h
ipcbuf.h
irq.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
ist.h
kdebug.h	[PATCH] Notifier chain update: API changes	2006-03-27 08:44:50 -08:00
kexec.h
kmap_types.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
kprobes.h	[PATCH] x86: kprobes-booster	2006-03-26 08:57:04 -08:00
ldt.h
linkage.h
local.h	[PATCH] make local_t signed	2006-03-31 12:18:55 -08:00
math_emu.h
mc146818rtc.h
mca_dma.h
mca.h
mce.h	[PATCH] Don't trigger full rebuild via CONFIG_X86_MCE	2006-06-23 07:42:56 -07:00
mman.h	[PATCH] add asm-generic/mman.h	2006-02-15 15:32:22 -08:00
mmu_context.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
mmu.h
mmx.h
mmzone.h	[PATCH] unify pfn_to_page: i386 pfn_to_page	2006-03-27 08:44:44 -08:00
module.h
mpspec_def.h
mpspec.h	[PATCH] mptspec: remove duplicate #include	2006-04-11 06:18:34 -07:00
msgbuf.h
msi.h	[PATCH] PCI: cleanup unused variable about msi driver	2006-06-21 12:00:00 -07:00
msr.h
mtrr.h	[PATCH] Don't trigger full rebuild via CONFIG_MTRR	2006-06-23 07:42:56 -07:00
mutex.h	[PATCH] x86: SMP alternatives	2006-03-23 07:38:04 -08:00
namei.h
nmi.h
node.h
numa.h
numaq.h
page.h	Exclude asm-generic/{page,memory_model}.h from user bits of i386/x86_64 page.h	2006-04-27 15:48:08 +01:00
param.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
parport.h
pci-direct.h
pci.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
percpu.h
pgalloc.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
pgtable-2level-defs.h
pgtable-2level.h	[PATCH] x86/PAE: Fix pte_clear for the >4GB RAM case	2006-04-27 12:00:59 -07:00
pgtable-3level-defs.h
pgtable-3level.h	[PATCH] x86/PAE: Fix pte_clear for the >4GB RAM case	2006-04-27 12:00:59 -07:00
pgtable.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6	2006-04-29 01:42:26 +01:00
poll.h	[PATCH] POLLRDHUP/EPOLLRDHUP handling for half-closed devices notifications	2006-03-25 08:22:56 -08:00
posix_types.h
processor.h	[PATCH] Don't trigger full rebuild via CONFIG_X86_MCE	2006-06-23 07:42:56 -07:00
ptrace.h
resource.h
rtc.h
rwlock.h	[PATCH] x86: SMP alternatives	2006-03-23 07:38:04 -08:00
rwsem.h
scatterlist.h
seccomp.h
sections.h
segment.h
semaphore.h	[PATCH] x86: SMP alternatives	2006-03-23 07:38:04 -08:00
sembuf.h
serial.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
setup.h	[PATCH] unify PFN_* macros	2006-03-27 08:44:48 -08:00
shmbuf.h
shmparam.h
sigcontext.h
siginfo.h
signal.h
smp.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
socket.h
sockios.h
sparsemem.h
spinlock_types.h
spinlock.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
srat.h
stat.h	[PATCH] 2TB files: st_blocks is invalid when calling stat64	2006-03-26 08:57:00 -08:00
statfs.h
string.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
suspend.h
system.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
termbits.h
termios.h
thread_info.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
timer.h
timex.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
tlb.h
tlbflush.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
topology.h	[PATCH] sched: new sched domain for representing multi-core	2006-03-27 08:44:43 -08:00
types.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
uaccess.h	[PATCH] x86: fix __range_ok constraint	2006-06-23 07:42:58 -07:00
ucontext.h
unaligned.h
unistd.h	[PATCH] sys_move_pages: 32bit support (i386, x86_64)	2006-06-23 07:42:53 -07:00
user.h
vga.h	[PATCH] vgacon: make VGA_MAP_MEM take size, remove extra use	2006-06-22 15:05:58 -07:00
vic.h
vm86.h
voyager.h
xor.h