Ingo Molnar fb10d5b7ef Merge branch 'linus' into sched/core ...

Resolve cherry-picking conflicts:

Conflicts:
	mm/huge_memory.c
	mm/memory.c
	mm/mprotect.c

See this upstream merge commit for more details:

  52469b4fcd4f Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Signed-off-by: Ingo Molnar <mingo@kernel.org>

2013-11-01 08:24:41 +01:00

..

acpica

ACPICA: Fix for a Store->ArgX when ArgX contains a reference to a field.

2013-09-06 15:39:59 +02:00

apei

Merge branch 'x86-ras-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2013-09-04 11:07:04 -07:00

ac.c

ACPI: Remove the old /proc/acpi/event interface

2013-07-15 13:56:36 +02:00

acpi_cmos_rtc.c

ACPI: Add CMOS RTC Operation Region handler support

2013-06-27 21:35:37 +02:00

acpi_ipmi.c

ACPI / IPMI: Fix atomic context requirement of ipmi_msg_handler()

2013-09-25 03:12:05 +02:00

acpi_lpss.c

ACPI / LPSS: don't crash if a device has no MMIO resources

2013-09-02 12:59:40 +02:00

acpi_memhotplug.c

ACPI / memhotplug: Fix a stale pointer in error path

2013-07-15 01:26:18 +02:00

acpi_pad.c

PTR_RET() is a weird name, and led to some confusing usage. We ended

2013-09-04 17:31:11 -07:00

acpi_platform.c

ACPI / scan: Drop unnecessary label from acpi_create_platform_device()

2013-08-07 01:11:33 +02:00

acpi_processor.c

ACPI / processor: Acquire writer lock to update CPU maps

2013-08-13 12:20:16 +02:00

battery.c

Merge branch 'acpi-assorted'

2013-08-27 01:29:04 +02:00

bgrt.c

acpi: bgrt: fix build error due to attribute change

2013-08-22 08:34:39 -07:00

blacklist.c

ACPI: blacklist win8 OSI for buggy laptops

2013-08-25 21:31:12 +02:00

bus.c

Merge branch 'acpi-assorted'

2013-08-27 01:29:04 +02:00

button.c

ACPI: Remove the old /proc/acpi/event interface

2013-07-15 13:56:36 +02:00

cm_sbs.c

…

container.c

Merge branch 'acpi-assorted'

2013-04-28 01:54:08 +02:00

custom_method.c

The sweeping change is to make add_taint() explicitly indicate whether to disable

2013-02-25 15:41:43 -08:00

debugfs.c

…

device_pm.c

ACPI / PM: Drop two functions that are not used any more

2013-10-17 15:44:48 +02:00

dock.c

Merge branch 'acpi-assorted'

2013-08-27 01:29:04 +02:00

ec_sys.c

ACPI / EC: access user space with get_user()/put_user()

2013-06-19 23:29:20 +02:00

ec.c

Merge branch 'acpi-assorted'

2013-08-30 14:13:50 +02:00

event.c

ACPI: Remove the old /proc/acpi/event interface

2013-07-15 13:56:36 +02:00

fan.c

ACPI / PM: Use ACPI_STATE_D3_COLD instead of ACPI_STATE_D3 everywhere

2013-07-30 14:36:20 +02:00

glue.c

ACPI / bind: Prefer device objects with _STA to those without it

2013-09-09 23:07:47 +02:00

hed.c

ACPI: Remove useless type argument of driver .remove() operation

2013-01-26 00:37:24 +01:00

internal.h

Merge back earlier 'acpi-assorted' material

2013-08-14 23:22:45 +02:00

Kconfig

ACPI: remove /proc/acpi/event from ACPI_BUTTON help

2013-10-16 00:31:47 +02:00

Makefile

i2c: move ACPI helpers into the core

2013-08-23 10:22:29 +02:00

numa.c

ACPI / numa: Fix __init attribute location in slit_valid()

2013-08-13 12:35:42 +02:00

nvs.c

…

osl.c

Merge branch 'acpi-assorted'

2013-08-27 01:29:04 +02:00

pci_irq.c

PCI/ACPI: Don't cache _PRT, and don't associate them with bus numbers

2013-02-16 11:58:34 -07:00

pci_link.c

ACPI: Set length even for TYPE_END_TAG acpi resource

2013-03-24 01:00:38 +01:00

pci_root.c

Merge branch 'pci/misc' into next

2013-08-29 17:23:33 -06:00

pci_slot.c

ACPI / PCI: Make bus registration and unregistration symmetric

2013-07-23 03:58:42 +02:00

power.c

ACPI / power: Drop automaitc resume of power resource dependent devices

2013-10-16 23:05:42 +02:00

proc.c

ACPI / PM: Walk physical_node_list under physical_node_lock

2013-08-06 02:26:22 +02:00

processor_core.c

Merge back earlier 'acpi-assorted' material

2013-08-14 23:22:45 +02:00

processor_driver.c

Merge branch 'acpi-processor'

2013-08-27 01:29:24 +02:00

processor_idle.c

sched, idle: Fix the idle polling state logic

2013-09-25 13:53:10 +02:00

processor_perflib.c

ACPI: introduce helper function acpi_has_method()

2013-07-15 01:33:10 +02:00

processor_thermal.c

ACPI / processor: Remove acpi_processor_get_limit_info()

2013-08-13 12:11:22 +02:00

processor_throttling.c

ACPI: suppress compiler warnings in processor_throttling.c

2013-03-25 00:05:48 +01:00

reboot.c

…

resource.c

ACPI: introduce helper function acpi_has_method()

2013-07-15 01:33:10 +02:00

sbs.c

ACPI: Remove the old /proc/acpi/event interface

2013-07-15 13:56:36 +02:00

sbshc.c

ACPI: Remove useless type argument of driver .remove() operation

2013-01-26 00:37:24 +01:00

sbshc.h

…

scan.c

ACPI / PM: Drop two functions that are not used any more

2013-10-17 15:44:48 +02:00

sleep.c

Merge branch 'acpi-assorted'

2013-08-27 01:29:04 +02:00

sleep.h

ACPI: Drop power resources driver

2013-01-17 14:11:06 +01:00

sysfs.c

Merge branch 'akpm' (updates from Andrew Morton)

2013-07-03 17:12:13 -07:00

tables.c

ACPICA: Cleanup table handler naming conflicts.

2013-01-11 13:10:16 +01:00

thermal.c

Merge branch 'acpi-assorted'

2013-08-30 14:13:50 +02:00

utils.c

ACPI: introduce two helper functions for _EJ0 and _LCK

2013-07-15 01:33:10 +02:00

video_detect.c

Merge branch 'acpi-cleanup'

2013-08-27 01:25:28 +02:00

video.c

Merge branch 'acpi-video'

2013-08-27 01:40:40 +02:00

wakeup.c

…