Merge branch 'linux-3.0.y' into cm-10.1

Conflicts:
	drivers/gpu/drm/i915/i915_debugfs.c

Signed-off-by: Humberto Borba <humberos@gmail.com>