Merge tag 'v3.0.36' of git://git.ti.com/ti-linux-kernel/ti-linux-kernel

Change-Id: Ic24504548827ded44e6d047d4b08357f346381a7