Daniel Vetter d40d91876a Merge branch 'topic/drm-vblank-rework' into drm-intel-next-queued ... Pull in the drm vblank rework from Ville and me. drm core parts acked by Dave Airlie Conflicts: drivers/gpu/drm/i915/intel_display.c Just a bit of fun around the placement of drm_vblank_on. This merge resolution has been tested in drm-intel-nightly for a while already. Acked-by: Dave Airlie <airlied@gmail.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>		2014-05-21 11:45:40 +02:00
..
acpi	IOMMU Upates for Linux v3.15	2014-04-05 18:46:26 -07:00
asm-generic	word-at-a-time: avoid undefined behaviour in zero_bytemask macro	2014-04-27 15:20:05 -07:00
clocksource	…
crypto	crypto: export NULL algorithms defines	2014-03-21 21:54:26 +08:00
drm	Merge branch 'topic/drm-vblank-rework' into drm-intel-next-queued	2014-05-21 11:45:40 +02:00
dt-bindings	dt: tegra: remove non-existent clock IDs	2014-04-24 15:37:08 +02:00
keys	…
kvm	…
linux	Takao Indoh reported that he was able to cause a ftrace bug while	2014-04-28 16:57:51 -07:00
math-emu	…
media	[media] rc-core: remove generic scancode filter	2014-04-06 11:30:29 -03:00
memory	…
misc	…
net	net: sctp: cache auth_enable per endpoint	2014-04-18 18:32:00 -04:00
pcmcia	…
ras	…
rdma	Merge branches 'core', 'cxgb4', 'ip-roce', 'iser', 'misc', 'mlx4', 'nes', 'ocrdma', 'qib', 'sgwrapper', 'srp' and 'usnic' into for-next	2014-04-03 08:30:17 -07:00
rxrpc	…
scsi	scsi: Make sure cmd_flags are 64-bit	2014-04-09 20:26:20 -06:00
sound	ALSA: cs8427: separate HW initialization	2014-04-03 14:59:48 +02:00
target	target/sbc: Add sbc_dif_read_strip software emulation	2014-04-07 01:48:57 -07:00
trace	These are regression and bug fixes for ext4.	2014-04-20 20:43:47 -07:00
uapi	drm/i915: Introduce mapping of user pages into video memory (userptr) ioctl	2014-05-16 19:31:29 +02:00
video	fbdev changes for 3.15 (OMAP)	2014-04-07 10:47:51 -07:00
xen	…
Kbuild	…