Daniel Vetter 5d0cf3d6e0 Merge branch 'topic/soix' into drm-intel-next-queued ... Jesse's SOix work required some patches from acpi-next, so pull it in through a topic barnch. Conflicts: drivers/gpu/drm/i915/i915_drv.c drivers/gpu/drm/i915/intel_pm.c Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>		2014-06-18 11:44:05 +02:00
..
acpi	Merge branch 'acpi-video'	2014-06-03 23:12:37 +02:00
asm-generic	asm-generic: remove _STK_LIM_MAX	2014-05-15 00:32:09 +01:00
clocksource
crypto
drm	drm: Allow drivers to register cursor planes with crtc	2014-06-13 17:45:22 +02:00
dt-bindings	3.15 fixes for AT91	2014-04-26 11:29:30 +02:00
keys
kvm
linux	Merge commit 'e81a0e771c10de86fdb52c6baf534ff5fdeec72c' into topic/soix	2014-06-12 17:46:02 +02:00
math-emu
media	[media] rc-core: remove generic scancode filter	2014-04-06 11:30:29 -03:00
memory
misc
net	net: fix inet_getid() and ipv6_select_ident() bugs	2014-06-02 14:09:28 -07:00
pcmcia
ras
rdma
rxrpc
scsi	scsi: Make sure cmd_flags are 64-bit	2014-04-09 20:26:20 -06:00
sound
target	target/sbc: Add sbc_dif_read_strip software emulation	2014-04-07 01:48:57 -07:00
trace	This contains two fixes.	2014-05-08 14:17:13 -07:00
uapi	drm/radeon: add query for number of active CUs	2014-06-09 22:06:55 -04:00
video	gpu: ipu-v3: Register the CSI modules	2014-06-04 11:07:12 +02:00
xen
Kbuild