-
Mauro Ribeiro authored
Merge tag 'v3.10.67' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into to_merge This is the 3.10.67 stable release Conflicts: drivers/gpu/drm/i915/i915_gem.c Change-Id: Ieb9025c9a14ee6676277e50f245a4ea2ef0d8b86
6904cf69