Merge branch 'linus'; commit 'v3.11-rc4' into neil-3.1x-plus
Merge branch 'neil-3.1x-plus' of git.goldelico.com:gta04-kernel into neil-3.1x-plus