Local updates
Merged upstream
Updated raspberrypi-sources-3.6.11-r4