Ingo Molnar 6e15cf0486 Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2 ...

Conflicts:
	arch/parisc/kernel/irq.c
	arch/x86/include/asm/fixmap_64.h
	arch/x86/include/asm/setup.h
	kernel/irq/handle.c

Semantic merge:
        arch/x86/include/asm/fixmap.h

Signed-off-by: Ingo Molnar <mingo@elte.hu>

2009-03-27 17:28:43 +01:00

..

acpica

acpi/x86: introduce __apci_map_table, v4

2009-02-09 13:35:07 +01:00

ac.c

Merge branch 'sysfs' into release

2008-11-11 21:14:49 -05:00

acpi_memhotplug.c

trivial: Fix misspelling of "firmware" in acpi_memhotplug.c

2009-01-06 11:28:08 +01:00

battery.c

battery: don't assume we are fully charged when not charging or discharging

2009-02-21 12:36:19 -05:00

blacklist.c

ACPI: delete OSI(Linux) DMI dmesg spam

2008-11-27 01:55:21 -05:00

bus.c

ACPI: remove doubled status checking

2009-03-16 00:35:30 -04:00

button.c

Merge branch 'ec' into release

2008-11-11 21:17:26 -05:00

cm_sbs.c

ACPI: remove private acpica headers from driver files

2008-12-31 01:15:22 -05:00

container.c

ACPI: add missing KERN_* constants to printks

2009-02-07 00:29:32 -05:00

debug.c

ACPI: remove private acpica headers from driver files

2008-12-31 01:15:22 -05:00

dock.c

Driver core: implement uevent suppress in kobject

2009-03-24 16:38:26 -07:00

ec.c

ACPI: EC: Add delay for slow MSI controller

2009-02-21 12:18:13 -05:00

event.c

netlink: change return-value logic of netlink_broadcast()

2009-02-05 23:56:36 -08:00

fan.c

ACPI: consolidate ACPI_*_COMPONENT definitions in acpi_drivers.h

2008-11-07 21:44:37 -05:00

glue.c

ACPI: struct device - replace bus_id with dev_name(), dev_set_name()

2009-02-07 00:41:13 -05:00

Kconfig

ACPI: remove CONFIG_ACPI_SYSTEM

2009-02-21 21:59:56 -05:00

Makefile

ACPI: remove CONFIG_ACPI_SYSTEM

2009-02-21 21:59:56 -05:00

numa.c

acpi: check for pxm_to_node_map overflow

2009-03-16 00:35:30 -04:00

osl.c

Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2

2009-03-27 17:28:43 +01:00

pci_bind.c

ACPI: simplify buffer management for acpi_pci_bind() etc.

2008-12-30 22:52:26 -05:00

pci_irq.c

ACPI: PCI: add HP copyright

2008-12-30 21:50:01 -05:00

pci_link.c

ACPI: add missing KERN_* constants to printks

2009-02-07 00:29:32 -05:00

pci_root.c

ACPI/PCI: PCI MSI _OSC support capabilities called when root bridge added

2009-01-07 11:12:31 -08:00

pci_slot.c

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6

2008-10-23 10:20:36 -07:00

power.c

ACPI: power.c: call acpi_get_name to get node name

2008-12-31 01:11:51 -05:00

proc.c

Merge branch 'alarm' into release

2009-01-09 03:36:32 -05:00

processor_core.c

cpumask: convert shared_cpu_map in acpi_processor* structs to cpumask_var_t

2009-01-03 19:15:40 +01:00

processor_idle.c

ACPI: delete CPU_IDLE=n code

2009-02-06 12:34:39 -05:00

processor_perflib.c

alloc_percpu: change percpu_ptr to per_cpu_ptr

2009-02-20 16:29:08 +09:00

processor_thermal.c

ACPI: consolidate ACPI_*_COMPONENT definitions in acpi_drivers.h

2008-11-07 21:44:37 -05:00

processor_throttling.c

cpumask: convert shared_cpu_map in acpi_processor* structs to cpumask_var_t

2009-01-03 19:15:40 +01:00

reboot.c

ACPI: reboot.c: use new acpi_reset interface

2008-12-31 01:15:00 -05:00

sbs.c

Merge branch 'linus' into test

2008-10-23 00:11:07 -04:00

sbshc.c

ACPI: remove private acpica headers from driver files

2008-12-31 01:15:22 -05:00

sbshc.h

ACPI: SBS: Ignore alarms coming from unknown devices

2007-12-14 15:14:06 -05:00

scan.c

ACPI: remove private acpica headers from driver files

2008-12-31 01:15:22 -05:00

sleep.c

ACPI suspend: Blacklist Toshiba Satellite L300 that requires to set SCI_EN directly on resume

2009-03-16 00:35:29 -04:00

sleep.h

ACPICA: create acpica/ directory

2009-01-09 03:30:47 -05:00

system.c

ACPICA: New: acpi_get_gpe_device interface

2008-12-31 01:10:24 -05:00

tables.c

acpi/x86: introduce __apci_map_table, v4

2009-02-09 13:35:07 +01:00

thermal.c

thermal fixup for broken BIOS which has invalid trip points.

2009-01-16 14:13:12 -05:00

utils.c

ACPI: scheduling in atomic via acpi_evaluate_integer ()

2008-11-26 17:39:06 -05:00

video_detect.c

ACPI: ec.c, pci_link.c, video_detec.c: static

2008-12-30 23:27:04 -05:00

video.c

Merge branches 'release', 'asus', 'bugzilla-12450', 'cpuidle', 'debug', 'ec', 'misc', 'printk' and 'processor' into release

2009-02-07 01:34:56 -05:00

wakeup.c

ACPICA: create acpica/ directory

2009-01-09 03:30:47 -05:00