projects / GitHub / MotorolaMobilityLLC / kernel-slsi.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5a9a8d1 d315777)
Merge remote branch 'linus/master' into drm-intel-fixes
authorChris Wilson <chris@chris-wilson.co.uk>
Sun, 23 Jan 2011 17:22:16 +0000 (17:22 +0000)
committerChris Wilson <chris@chris-wilson.co.uk>
Mon, 24 Jan 2011 18:27:32 +0000 (18:27 +0000)
commit8a327f23e23fa509e6e3c2263ae1cc0a67dec387
tree119abf09e1ec9babaf78e6889187f9d54864b118tree | snapshot (tar.gz zip)
parent5a9a8d1a99c617df82339456fbdd30d6ed3a856bcommit | diff
parentd315777b32a4696feb86f2a0c9e9f39c94683649commit | diff
Merge remote branch 'linus/master' into drm-intel-fixes

Merge with Linus to resolve conflicting fixes for the reusing the stale
HEAD value during intel_ring_wait().

Conflicts:
drivers/gpu/drm/i915/intel_ringbuffer.c
drivers/gpu/drm/Kconfig diff1 | diff2 | blob | history
Motorola kernel-slsi