-
Mauro Ribeiro authored
Merge branch 'linux-3.10.y' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidxu3-3.10.y Conflicts: drivers/clocksource/exynos_mct.c drivers/i2c/busses/i2c-s3c2410.c drivers/input/evdev.c drivers/mmc/card/block.c drivers/usb/dwc3/gadget.c include/linux/mm_types.h sound/soc/codecs/wm5110.c
299a2f8d