summaryrefslogtreecommitdiffstats
path: root/include/acpi
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-07-16 00:29:07 +0200
committerIngo Molnar <mingo@elte.hu>2008-07-16 00:29:07 +0200
commit82638844d9a8581bbf33201cc209a14876eca167 (patch)
tree961d7f9360194421a71aa644a9d0c176a960ce49 /include/acpi
parentRevert "cpumask: introduce new APIs" (diff)
parentgeneric ipi function calls: wait on alloc failure fallback (diff)
downloadlinux-82638844d9a8581bbf33201cc209a14876eca167.tar.xz
linux-82638844d9a8581bbf33201cc209a14876eca167.zip
Merge branch 'linus' into cpus4096
Conflicts: arch/x86/xen/smp.c kernel/sched_rt.c net/iucv/iucv.c Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/acpi')
0 files changed, 0 insertions, 0 deletions