Linus Torvalds 9a90e09854 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: (27 commits) ACPI: Don't let acpi_pad needlessly mark TSC unstable drivers/acpi/sleep.h: Checkpatch cleanup ACPI: Minor cleanup eliminating redundant PMTIMER_TICKS to NS conversion ACPI: delete unused c-state promotion/demotion data strucutures ACPI: video: fix acpi_backlight=video ACPI: EC: Use kmemdup drivers/acpi: use kasprintf ACPI, APEI, EINJ injection parameters support Add x64 support to debugfs ACPI, APEI, Use ERST for persistent storage of MCE ACPI, APEI, Error Record Serialization Table (ERST) support ACPI, APEI, Generic Hardware Error Source memory error support ACPI, APEI, UEFI Common Platform Error Record (CPER) header Unified UUID/GUID definition ACPI Hardware Error Device (PNP0C33) support ACPI, APEI, PCIE AER, use general HEST table parsing in AER firmware_first setup ACPI, APEI, Document for APEI ACPI, APEI, EINJ support ACPI, APEI, HEST table parsing ACPI, APEI, APEI supporting infrastructure ...		2010-05-28 14:42:18 -07:00
..
native	ia64/pv_ops: paravirtualize gate.S.	2009-03-26 11:01:46 -07:00
sn	tree-wide: fix assorted typos all over the place	2009-12-04 15:39:55 +01:00
uv	sgi-gru: add macros for using the UV hub to send interrupts	2009-04-02 19:05:05 -07:00
xen	xen: Remove unnecessary arch specific xen irq functions.	2010-02-18 17:17:58 -08:00
acpi-ext.h
acpi.h	ACPI: delete the "acpi=ht" boot option	2010-03-14 20:58:38 -04:00
agp.h	agp: kill phys_to_gart() and gart_to_phys()	2009-08-03 09:05:00 +01:00
asm-offsets.h	kbuild: move asm-offsets.h to include/generated	2009-12-12 13:08:14 +01:00
asmmacro.h
atomic.h	atomic_t: Cast to volatile when accessing atomic variables	2010-05-17 07:57:27 -07:00
auxvec.h
bitops.h	bitops: Optimize hweight() by making use of compile-time evaluation	2010-04-06 15:52:11 -07:00
bitsperlong.h	asm-generic: introduce asm/bitsperlong.h	2009-06-11 21:02:14 +02:00
break.h
bug.h
bugs.h
byteorder.h
cache.h
cacheflush.h	block: add helpers to run flush_dcache_page() against a bio and a request's pages	2009-11-26 09:16:19 +01:00
checksum.h
compat.h	improve sys_newuname() for compat architectures	2010-03-12 15:52:32 -08:00
cpu.h
cputime.h	cputime: Optimize jiffies_to_cputime(1)	2009-08-03 14:48:36 +02:00
current.h
cyclone.h
delay.h
device.h	Driver Core: Add platform device arch data V3	2009-07-22 00:28:38 +02:00
div64.h
dma-mapping.h	dma-mapping: fix off-by-one error in dma_capable()	2009-12-16 07:20:12 -08:00
dma.h
dmi.h	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
elf.h	elf coredump: replace ELF_CORE_EXTRA_* macros by functions	2010-03-06 11:26:45 -08:00
emergency-restart.h
errno.h
esi.h
fb.h
fcntl.h
fpswa.h
fpu.h	Revert "Neither asm/types.h nor linux/types.h is required for arch/ia64/include/asm/fpu.h"	2009-07-17 06:35:05 -07:00
ftrace.h	[IA64] sanity in #include files. Move fnptr to types.h	2010-01-06 15:52:35 -08:00
futex.h
gcc_intrin.h	[IA64] Convert ia64 to use int-ll64.h	2009-06-17 09:33:49 -07:00
hardirq.h
hpsim.h
hugetlb.h
hw_irq.h	[IA64] preallocate IA64_IRQ_MOVE_VECTOR	2009-12-14 16:03:36 -08:00
ia64regs.h
idle.h	[IA64] xen_domu_defconfig: fix build issues/warnings	2009-05-05 11:43:13 -07:00
intel_intrin.h
intrinsics.h	Pull pvops into release branch	2009-03-31 14:25:08 -07:00
io.h	implement early_io{re,un}map for ia64	2009-12-16 02:45:10 +00:00
ioctl.h
ioctls.h
iommu.h	intel-iommu: Fix one last ia64 build problem in Pass Through Support	2009-06-05 20:49:53 +01:00
iosapic.h
ipcbuf.h
irq_regs.h
irq.h	ia64: move nr-irqs.h to include/generated	2009-12-12 13:08:14 +01:00
Kbuild	[IA64] unexport fpswa.h	2009-06-15 14:32:54 -07:00
kdebug.h
kexec.h
kmap_types.h	kmap_types: make most arches use generic header file	2009-06-16 19:47:51 -07:00
kprobes.h	[IA64] sanity in #include files. Move fnptr to types.h	2010-01-06 15:52:35 -08:00
kregs.h
kvm_host.h	KVM: Move irq ack notifier list to arch independent code	2009-12-03 09:32:07 +02:00
kvm_para.h	KVM: Add __KERNEL__ guards to exported headers	2009-09-10 10:46:48 +03:00
kvm.h	KVM: Maintain back mapping from irqchip/pin to gsi	2009-12-03 09:32:07 +02:00
libata-portmap.h
linkage.h
local.h
machvec_dig_vtd.h
machvec_dig.h
machvec_hpsim.h
machvec_hpzx1_swiotlb.h
machvec_hpzx1.h
machvec_init.h
machvec_sn2.h
machvec_uv.h
machvec_xen.h
machvec.h
mc146818rtc.h
mca_asm.h
mca.h	[IA64] Save I-resources to ia64_sal_os_state	2009-12-14 16:37:58 -08:00
meminit.h	ia64: don't alias VMALLOC_END to vmalloc_end	2009-10-02 13:28:55 +09:00
mman.h	mm: remove duplicate asm/mman.h files	2009-09-22 07:17:42 -07:00
mmu_context.h	cpumask: use mm_cpumask() wrapper: ia64	2009-03-16 14:12:48 +10:30
mmu.h
mmzone.h	[IA64] removing redundant ifdef	2010-05-18 14:45:52 -07:00
module.h	ia64/pv_ops/bp/module: support binary patching for kernel module.	2009-03-26 11:02:51 -07:00
msgbuf.h
msidef.h	ia64: Move the macro definitions related to MSI to one header file.	2009-03-24 11:03:12 +02:00
mutex.h
nodedata.h
numa.h	hugetlb: add generic definition of NUMA_NO_NODE	2009-12-15 08:53:12 -08:00
page.h
pal.h	[IA64] Convert ia64 to use int-ll64.h	2009-06-17 09:33:49 -07:00
param.h
paravirt_patch.h	ia64/pv_op/binarypatch: add helper functions to support binary patching for paravirt_ops.	2009-03-26 11:02:31 -07:00
paravirt_privop.h	[IA64] fix allmodconfig compilation breakage.	2009-04-20 09:46:29 -07:00
paravirt.h	ia64/pv_ops: implement binary patching optimization for native.	2009-03-26 11:02:42 -07:00
parport.h
patch.h
pci.h	pci-dma: add linux/pci-dma.h to linux/pci.h	2010-03-12 15:52:42 -08:00
percpu.h	ia64: add sparse annotation to __ia64_per_cpu_var()	2010-05-12 12:10:39 +02:00
perfmon_default_smpl.h	tree-wide: fix assorted typos all over the place	2009-12-04 15:39:55 +01:00
perfmon.h
pgalloc.h	mm: Pass virtual address to [__]p{te,ud,md}_free_tlb()	2009-07-27 12:10:38 -07:00
pgtable.h	MM: Pass a PTE pointer to update_mmu_cache() rather than the PTE itself	2010-02-20 16:41:46 +00:00
poll.h
posix_types.h
processor.h	[IA64] Remove COMPAT_IA32 support	2010-02-08 10:42:17 -08:00
ptrace_offsets.h
ptrace.h	ptrace: move user_enable_single_step & co prototypes to linux/ptrace.h	2010-03-12 15:52:38 -08:00
pvclock-abi.h
resource.h
rse.h
rwsem.h	[IA64] Replace old style lock initializer	2009-12-14 16:39:45 -08:00
sal.h	[IA64] Convert ia64 to use int-ll64.h	2009-06-17 09:33:49 -07:00
scatterlist.h	asm-generic: remove ARCH_HAS_SG_CHAIN in scatterlist.h	2010-05-27 09:12:54 -07:00
sections.h
segment.h
sembuf.h
serial.h
setup.h
shmbuf.h
shmparam.h
sigcontext.h
siginfo.h
signal.h	asm-generic: rename termios.h, signal.h and mman.h	2009-06-11 21:01:52 +02:00
smp.h	cpumask: remove arch_send_call_function_ipi	2009-09-24 09:34:47 +09:30
socket.h	net: Generalize socket rx gap / receive queue overflow cmsg	2009-10-12 13:26:31 -07:00
sockios.h
sparsemem.h
spinlock_types.h	locking: Convert raw_rwlock to arch_rwlock	2009-12-14 23:55:32 +01:00
spinlock.h	locking: Convert raw_rwlock functions to arch_rwlock	2009-12-14 23:55:32 +01:00
stat.h
statfs.h
string.h
swab.h
swiotlb.h	swiotlb: Remove duplicate swiotlb_force extern declarations	2009-11-15 09:03:10 +01:00
sync_bitops.h
syscall.h	[IA64] Remove COMPAT_IA32 support	2010-02-08 10:42:17 -08:00
system.h	[IA64] Remove COMPAT_IA32 support	2010-02-08 10:42:17 -08:00
termbits.h
termios.h
thread_info.h	add descriptive comment for TIF_MEMDIE task flag declaration.	2010-05-14 11:13:27 +02:00
timex.h	ia64/pv_ops/pv_time_ops: add sched_clock hook.	2009-03-26 10:50:42 -07:00
tlb.h	[IA64] __per_cpu_idtrs[] is a memory hog	2010-01-07 16:10:57 -08:00
tlbflush.h
topology.h	numa: ia64: use generic percpu var numa_node_id() implementation	2010-05-27 09:12:57 -07:00
types.h	[IA64] move fnptr definition inside #ifdef __KERNEL__	2010-01-08 10:53:28 -08:00
uaccess.h
ucontext.h
unaligned.h
uncached.h
unistd.h	[IA64] Remove COMPAT_IA32 support	2010-02-08 10:42:17 -08:00
unwind.h
user.h
ustack.h
vga.h
xor.h