Merge remote-tracking branch 'linux/linux-3.4.y' into HEAD

Change-Id: I51a9582c4a01410c1807b4a484a60808d71c9595
Signed-off-by: Josue Rivera <prbassplayer@gmail.com>