Dave Airlie
8d4ad9d4bb
Merge commit ' 9e9a928eed' into drm-next
...
Merge drm-fixes into drm-next.
Both i915 and radeon need this done for later patches.
Conflicts:
drivers/gpu/drm/drm_crtc_helper.c
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/i915/i915_gem_execbuffer.c
drivers/gpu/drm/i915/i915_gem_gtt.c
2014-06-05 20:28:59 +10:00
..
acpi
IOMMU Upates for Linux v3.15
2014-04-05 18:46:26 -07:00
asm-generic
asm-generic: remove _STK_LIM_MAX
2014-05-15 00:32:09 +01:00
clocksource
crypto
drm
Merge commit ' 9e9a928eed' into drm-next
2014-06-05 20:28:59 +10:00
dt-bindings
3.15 fixes for AT91
2014-04-26 11:29:30 +02:00
keys
kvm
linux
kernfs: move the last knowledge of sysfs out from kernfs
2014-06-03 08:11:18 -07: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
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
This contains two fixes.
2014-05-08 14:17:13 -07:00
uapi
Merge commit ' 9e9a928eed' into drm-next
2014-06-05 20:28:59 +10:00
video
fbdev changes for 3.15 (OMAP)
2014-04-07 10:47:51 -07:00
xen
Kbuild