summaryrefslogtreecommitdiff
path: root/Documentation/devicetree/bindings/i2c/fsl-i2c.txt
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2011-03-07 15:32:44 +0300
committerChris Wilson <chris@chris-wilson.co.uk>2011-03-07 15:35:15 +0300
commit47ae63e0c2e5fdb582d471dc906eb29be94c732f (patch)
treef5aceffc0bc82c8cc4d5e96ef73280b018a6f333 /Documentation/devicetree/bindings/i2c/fsl-i2c.txt
parentc59a333f73868ca6fbcecea99b3542e2c62a3a5c (diff)
parent467cffba85791cdfce38c124d75bd578f4bb8625 (diff)
downloadlinux-47ae63e0c2e5fdb582d471dc906eb29be94c732f.tar.xz
Merge branch 'drm-intel-fixes' into drm-intel-next
Apply the trivial conflicting regression fixes, but keep GPU semaphores enabled. Conflicts: drivers/gpu/drm/i915/i915_drv.h drivers/gpu/drm/i915/i915_gem_execbuffer.c
Diffstat (limited to 'Documentation/devicetree/bindings/i2c/fsl-i2c.txt')
0 files changed, 0 insertions, 0 deletions