Rafael J. Wysocki d4c091f13d Merge branch 'acpi-general' ... * acpi-general: (38 commits) ACPI / thermal: _TMP and _CRT/_HOT/_PSV/_ACx dependency fix ACPI: drop unnecessary local variable from acpi_system_write_wakeup_device() ACPI: Fix logging when no pci_irq is allocated ACPI: Update Dock hotplug error messages ACPI: Update Container hotplug error messages ACPI: Update Memory hotplug error messages ACPI: Update CPU hotplug error messages ACPI: Add acpi_handle_<level>() interfaces ACPI: remove use of __devexit ACPI / PM: Add Sony Vaio VPCEB1S1E to nonvs blacklist. ACPI / battery: Correct battery capacity values on Thinkpads Revert "ACPI / x86: Add quirk for "CheckPoint P-20-00" to not use bridge _CRS_ info" ACPI: create _SUN sysfs file ACPI / memhotplug: bind the memory device when the driver is being loaded ACPI / memhotplug: don't allow to eject the memory device if it is being used ACPI / memhotplug: free memory device if acpi_memory_enable_device() failed ACPI / memhotplug: fix memory leak when memory device is unbound from acpi_memhotplug ACPI / memhotplug: deal with eject request in hotplug queue ACPI / memory-hotplug: add memory offline code to acpi_memory_device_remove() ACPI / memory-hotplug: call acpi_bus_trim() to remove memory device ... Conflicts: include/linux/acpi.h (two additions at the end of the same file)		2012-11-29 21:43:06 +01:00
..
acpi	Merge branch 'acpi-general'	2012-11-29 21:43:06 +01:00
asm-generic	UAPI: Remove empty non-UAPI Kbuild files	2012-10-17 12:31:15 +01:00
clocksource
crypto	Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux	2012-10-14 13:39:34 -07:00
drm	drm/radeon: add new SI pci id	2012-11-21 18:37:38 -05:00
keys
linux	Merge branch 'acpi-general'	2012-11-29 21:43:06 +01:00
math-emu
media
memory
misc
net	xfrm: Fix the gc threshold value for ipv4	2012-11-13 09:15:07 +01:00
pcmcia
ras
rdma
rxrpc
scsi	[SCSI] sd: Implement support for WRITE SAME	2012-11-13 22:45:42 -08:00
sound	ALSA: Add a reference counter to card instance	2012-10-30 11:07:10 +01:00
target
trace	xen/mmu: Use Xen specific TLB flush instead of the generic one.	2012-10-31 12:38:31 -04:00
uapi	mm, oom: reintroduce /proc/pid/oom_adj	2012-11-16 10:15:35 -08:00
video	fbdev updates for 3.7	2012-10-12 10:21:02 +09:00
xen	Bug-fixes:	2012-11-10 06:56:21 +01:00
Kbuild	UAPI: Remove empty non-UAPI Kbuild files	2012-10-17 12:31:15 +01:00