merge branch linux-3.0.y of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable

Change-Id: I8a0a710a24fbdbbbb332bf44aa5c68971f4e090b