94e0fb086f
* '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}
|
||
|---|---|---|
| .. | ||
| agp | ||
| hw_random | ||
| ip2 | ||
| ipmi | ||
| mwave | ||
| pcmcia | ||
| rio | ||
| tpm | ||
| xilinx_hwicap | ||
| .gitignore | ||
| amiserial.c | ||
| apm-emulation.c | ||
| applicom.c | ||
| applicom.h | ||
| bfin_jtag_comm.c | ||
| bfin-otp.c | ||
| briq_panel.c | ||
| bsr.c | ||
| cd1865.h | ||
| ChangeLog | ||
| consolemap.c | ||
| cp437.uni | ||
| cs5535_gpio.c | ||
| cyclades.c | ||
| defkeymap.c_shipped | ||
| defkeymap.map | ||
| digi1.h | ||
| digiFep1.h | ||
| digiPCI.h | ||
| ds1302.c | ||
| ds1620.c | ||
| dsp56k.c | ||
| dtlk.c | ||
| efirtc.c | ||
| epca.c | ||
| epca.h | ||
| epcaconfig.h | ||
| esp.c | ||
| generic_nvram.c | ||
| generic_serial.c | ||
| genrtc.c | ||
| hangcheck-timer.c | ||
| hpet.c | ||
| hvc_beat.c | ||
| hvc_console.c | ||
| hvc_console.h | ||
| hvc_irq.c | ||
| hvc_iseries.c | ||
| hvc_iucv.c | ||
| hvc_rtas.c | ||
| hvc_udbg.c | ||
| hvc_vio.c | ||
| hvc_xen.c | ||
| hvcs.c | ||
| hvsi.c | ||
| i8k.c | ||
| isicom.c | ||
| istallion.c | ||
| Kconfig | ||
| keyboard.c | ||
| lp.c | ||
| Makefile | ||
| mbcs.c | ||
| mbcs.h | ||
| mem.c | ||
| misc.c | ||
| mmtimer.c | ||
| moxa.c | ||
| moxa.h | ||
| mspec.c | ||
| mxser.c | ||
| mxser.h | ||
| n_hdlc.c | ||
| n_r3964.c | ||
| n_tty.c | ||
| nozomi.c | ||
| nsc_gpio.c | ||
| nvram.c | ||
| nwbutton.c | ||
| nwbutton.h | ||
| nwflash.c | ||
| pc8736x_gpio.c | ||
| ppdev.c | ||
| ps3flash.c | ||
| pty.c | ||
| random.c | ||
| raw.c | ||
| riscom8_reg.h | ||
| riscom8.c | ||
| riscom8.h | ||
| rocket_int.h | ||
| rocket.c | ||
| rocket.h | ||
| rtc.c | ||
| scc.h | ||
| scx200_gpio.c | ||
| selection.c | ||
| ser_a2232.c | ||
| ser_a2232.h | ||
| ser_a2232fw.ax | ||
| ser_a2232fw.h | ||
| serial167.c | ||
| snsc_event.c | ||
| snsc.c | ||
| snsc.h | ||
| sonypi.c | ||
| specialix_io8.h | ||
| specialix.c | ||
| stallion.c | ||
| sx.c | ||
| sx.h | ||
| sxboards.h | ||
| sxwindow.h | ||
| synclink_gt.c | ||
| synclink.c | ||
| synclinkmp.c | ||
| sysrq.c | ||
| tb0219.c | ||
| tlclk.c | ||
| toshiba.c | ||
| tty_audit.c | ||
| tty_buffer.c | ||
| tty_io.c | ||
| tty_ioctl.c | ||
| tty_ldisc.c | ||
| tty_port.c | ||
| uv_mmtimer.c | ||
| vc_screen.c | ||
| viotape.c | ||
| virtio_console.c | ||
| vme_scc.c | ||
| vt_ioctl.c | ||
| vt.c | ||