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
..
asm-generic	allow O_TMPFILE to work with O_WRONLY	2013-07-20 03:11:32 +04:00
drm	drm/i915: Make i915 events part of uapi	2013-07-19 18:26:57 +02:00
linux	Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus	2013-07-13 14:52:21 -07:00
mtd	UBI: document UBI_IOCVOLUP better in user header	2013-05-29 15:19:26 +03:00
rdma	RDMA/ucma: Allow user space to specify AF_IB when joining multicast	2013-06-20 23:35:45 -07:00
scsi	FCoE Updates for 3.9	2013-03-01 09:10:08 +00:00
sound	ALSA: Replace the magic number 44 with const	2013-06-28 12:14:44 +02:00
video	UAPI: (Scripted) Disintegrate include/video	2012-12-20 17:14:26 +00:00
xen
Kbuild