summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_drv.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-03-09 14:00:44 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-03-09 14:00:44 -0800
commit687530b44de7e0fe70fabb4200d4cabce3af1a0c (patch)
tree0ffb4bedbd51c89c1456fc38319c598ecb203df0 /drivers/gpu/drm/i915/i915_drv.c
parent78833dd70602be6b71ef34225f708b1e500947dc (diff)
parentbad3babace2ee4d1763b4016a662a5c660ab92e9 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc: mmc: fix CONFIG_MMC_UNSAFE_RESUME regression
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.c')
0 files changed, 0 insertions, 0 deletions