Daniel Vetter cb54b53ada Merge commit 'Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux' ... This backmerges Linus' merge commit of the latest drm-fixes pull: commit 549f3a1218 Merge: 42577ca 058ca4a Author: Linus Torvalds <torvalds@linux-foundation.org> Date: Tue Jul 23 15:47:08 2013 -0700 Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux We've accrued a few too many conflicts, but the real reason is that I want to merge the 100% solution for Haswell concurrent registers writes into drm-intel-next. But that depends upon the 90% bandaid merged into -fixes: commit a7cd1b8fea Author: Chris Wilson <chris@chris-wilson.co.uk> Date: Fri Jul 19 20:36:51 2013 +0100 drm/i915: Serialize almost all register access Also, we can roll up on accrued conflicts. Usually I'd backmerge a tagged -rc, but I want to get this done before heading off to vacations next week ;-) Conflicts: drivers/gpu/drm/i915/i915_dma.c drivers/gpu/drm/i915/i915_gem.c v2: For added hilarity we have a init sequence conflict around the gt_lock, so need to move that one, too. Spotted by Jani Nikula. Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>		2013-07-25 15:18:41 +02:00
..
acpi	ACPI / video / i915: No ACPI backlight if firmware expects Windows 8	2013-07-18 02:08:06 +02:00
asm-generic	Merge branch 'cpuinit-delete' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2013-07-07 11:01:19 -07:00
clocksource
crypto
drm	Merge commit 'Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux'	2013-07-25 15:18:41 +02:00
dt-bindings	ARM: at91: dt: add header to define at_hdmac configuration	2013-07-05 11:40:53 +05:30
keys
kvm	ARM: KVM: Allow host virt timer irq to be different from guest timer virt irq	2013-06-26 10:50:02 -07:00
linux	Merge branch 'for-3.11/drivers' of git://git.kernel.dk/linux-block	2013-07-22 19:02:52 -07:00
math-emu
media	[media] exynos4-is: Correct colorspace handling at FIMC-LITE	2013-06-28 15:33:27 -03:00
memory
misc
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-07-13 17:42:22 -07:00
pcmcia
ras
rdma	Merge branches 'af_ib', 'cxgb4', 'misc', 'mlx5', 'ocrdma', 'qib' and 'srp' into for-next	2013-07-08 11:22:11 -07:00
rxrpc
scsi	[SCSI] libiscsi: Added new boot entries in the session sysfs	2013-06-26 18:04:11 -07:00
sound	ASoC: More updates for v3.11	2013-06-28 13:36:22 +02:00
target	target: make queue_tm_rsp() return void	2013-07-07 18:36:53 -07:00
trace	This contains fixes, optimizations and some clean ups	2013-07-22 19:07:24 -07:00
uapi	Merge commit 'Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux'	2013-07-25 15:18:41 +02:00
video	Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux	2013-07-09 16:04:31 -07:00
xen	Merge branch 'for-3.11/drivers' of git://git.kernel.dk/linux-block	2013-07-22 19:02:52 -07:00
Kbuild