diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-01-28 19:12:00 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-01-28 19:12:00 +1100 |
| commit | 3d12730a2a762e79242af2e7598a0c98908c3d4c (patch) | |
| tree | 5600359bc682c30f5d53a57fa1e7e291d9fe7c33 /drivers/gpu | |
| parent | 8926efae2f53dc4cf42884e56dba4b1337892fac (diff) | |
| parent | 5c8d1b68e01a144813e38795fe6dbe7ebb506131 (diff) | |
Merge remote-tracking branch 'trivial/for-next'
Conflicts:
arch/mips/cavium-octeon/executive/cvmx-helper-util.c
arch/mips/include/asm/octeon/cvmx-helper-util.h
drivers/devfreq/exynos4_bus.c
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_debugfs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c index ba0946544360..2637a230b5d3 100644 --- a/drivers/gpu/drm/i915/i915_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c @@ -1534,7 +1534,7 @@ static const char *swizzle_string(unsigned swizzle) case I915_BIT_6_SWIZZLE_9_10_17: return "bit9/bit10/bit17"; case I915_BIT_6_SWIZZLE_UNKNOWN: - return "unkown"; + return "unknown"; } return "bug"; |