-
Mauro Ribeiro authored
Merge tag 'v3.10.48' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidxu3-3.10.y-bin2 This is the 3.10.48 stable release Conflicts: drivers/gpu/drm/radeon/atombios_crtc.c drivers/gpu/drm/radeon/radeon_cs.c
07642cba