-
Mauro Ribeiro authored
Merge tag 'v3.10.55' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidxu3-3.10.y This is the 3.10.55 stable release Conflicts: sound/soc/codecs/wm_adsp.c sound/soc/samsung/i2s.c Change-Id: If4ddc0e632bbe8dcf33ba206fe8f10e2242e35f6
9ee834e9