Linus Torvalds
94e0fb086f
Merge branch 'drm-intel-next' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel
...
* 'drm-intel-next' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel: (57 commits)
drm/i915: Handle ERESTARTSYS during page fault
drm/i915: Warn before mmaping a purgeable buffer.
drm/i915: Track purged state.
drm/i915: Remove eviction debug spam
drm/i915: Immediately discard any backing storage for uneeded objects
drm/i915: Do not mis-classify clean objects as purgeable
drm/i915: Whitespace correction for madv
drm/i915: BUG_ON page refleak during unbind
drm/i915: Search harder for a reusable object
drm/i915: Clean up evict from list.
drm/i915: Add tracepoints
drm/i915: framebuffer compression for GM45+
drm/i915: split display functions by chip type
drm/i915: Skip the sanity checks if the current relocation is valid
drm/i915: Check that the relocation points to within the target
drm/i915: correct FBC update when pipe base update occurs
drm/i915: blacklist Acer AspireOne lid status
ACPI: make ACPI button funcs no-ops if not built in
drm/i915: prevent FIFO calculation overflows on 32 bits with high dotclocks
drm/i915: intel_display.c handle latency variable efficiently
...
Fix up trivial conflicts in drivers/gpu/drm/i915/{i915_dma.c|i915_drv.h}
2009-09-24 10:30:41 -07:00
..
acpica
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
2009-09-23 09:32:11 -07:00
ac.c
ACPI: Move definition of PREFIX from acpi_bus.h to internal..h
2009-08-28 19:57:27 -04:00
acpi_memhotplug.c
Merge branch 'bjorn-start-stop-2.6.32' into release
2009-09-19 01:56:39 -04:00
battery.c
Merge branch 'battery' into release
2009-09-19 01:56:17 -04:00
blacklist.c
Merge branch 'sfi-base' into release
2009-09-19 00:37:13 -04:00
bus.c
Merge branch 'misc-2.6.32' into release
2009-09-19 02:14:45 -04:00
button.c
Merge branch 'drm-intel-next' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel
2009-09-24 10:30:41 -07:00
cm_sbs.c
ACPI: Move definition of PREFIX from acpi_bus.h to internal..h
2009-08-28 19:57:27 -04:00
container.c
Merge branch 'acpica' into release
2009-09-19 01:45:22 -04:00
debug.c
acpi: switch /proc/acpi/{debug_layer,debug_level} to seq_file
2009-09-19 01:38:57 -04:00
dock.c
Merge branch 'acpica' into release
2009-09-19 01:45:22 -04:00
ec.c
Merge branch 'misc-2.6.32' into release
2009-09-19 02:14:45 -04:00
event.c
ACPI: Move definition of PREFIX from acpi_bus.h to internal..h
2009-08-28 19:57:27 -04:00
fan.c
ACPI: Move definition of PREFIX from acpi_bus.h to internal..h
2009-08-28 19:57:27 -04:00
glue.c
Merge branch 'acpica' into release
2009-09-19 01:45:22 -04:00
internal.h
ACPI: Move definition of PREFIX from acpi_bus.h to internal..h
2009-08-28 19:57:27 -04:00
Kconfig
Merge branch 'processor-procfs-2.6.32' into release
2009-09-19 02:10:40 -04:00
Makefile
hwmon driver for ACPI 4.0 power meters
2009-09-19 01:30:01 -04:00
numa.c
ACPI: Move definition of PREFIX from acpi_bus.h to internal..h
2009-08-28 19:57:27 -04:00
osl.c
ACPI: remove cpumask_t usage
2009-09-24 09:34:38 +09:30
pci_bind.c
ACPI: kill acpi_get_pci_id
2009-06-17 23:32:23 -04:00
pci_irq.c
ACPI: Move definition of PREFIX from acpi_bus.h to internal..h
2009-08-28 19:57:27 -04:00
pci_link.c
ACPI: Move definition of PREFIX from acpi_bus.h to internal..h
2009-08-28 19:57:27 -04:00
pci_root.c
Merge branch 'sfi-base' into release
2009-09-19 00:37:13 -04:00
pci_slot.c
Merge branch 'misc-2.6.32' into release
2009-09-19 02:14:45 -04:00
power.c
Merge branch 'sfi-base' into release
2009-09-19 00:37:13 -04:00
power_meter.c
hwmon driver for ACPI 4.0 power meters
2009-09-19 01:30:01 -04:00
proc.c
ACPI: convert acpi_device_lock spinlock to mutex
2009-04-07 00:02:40 -04:00
processor_core.c
Merge branch 'processor-procfs-2.6.32' into release
2009-09-19 02:10:40 -04:00
processor_idle.c
Merge branch 'processor-procfs-2.6.32' into release
2009-09-19 02:10:40 -04:00
processor_perflib.c
cpumask: use zalloc_cpumask_var() where possible
2009-09-24 09:34:24 +09:30
processor_thermal.c
Merge branch 'processor-procfs-2.6.32' into release
2009-09-19 02:10:40 -04:00
processor_throttling.c
cpumask: use zalloc_cpumask_var() where possible
2009-09-24 09:34:24 +09:30
reboot.c
sbs.c
ACPI: Move definition of PREFIX from acpi_bus.h to internal..h
2009-08-28 19:57:27 -04:00
sbshc.c
ACPI: Move definition of PREFIX from acpi_bus.h to internal..h
2009-08-28 19:57:27 -04:00
sbshc.h
scan.c
ACPI: don't pass handle for fixed hardware notifications
2009-09-19 02:15:05 -04:00
sleep.c
Merge branch 'linus' into release
2009-09-19 00:06:59 -04:00
sleep.h
ACPI: convert acpi_device_lock spinlock to mutex
2009-04-07 00:02:40 -04:00
system.c
ACPI: Move definition of PREFIX from acpi_bus.h to internal..h
2009-08-28 19:57:27 -04:00
tables.c
ACPI: check acpi_disabled in acpi_table_parse() and acpi_table_parse_entries()
2009-08-28 19:57:28 -04:00
thermal.c
ACPI: Move definition of PREFIX from acpi_bus.h to internal..h
2009-08-28 19:57:27 -04:00
utils.c
ACPI: Move definition of PREFIX from acpi_bus.h to internal..h
2009-08-28 19:57:27 -04:00
video.c
Merge branch 'video' into release
2009-09-19 02:31:39 -04:00
video_detect.c
ACPI: Move definition of PREFIX from acpi_bus.h to internal..h
2009-08-28 19:57:27 -04:00
wakeup.c
ACPI PM: Replace wakeup.prepared with reference counter
2009-09-09 14:19:18 -07:00