Merge tag 'v3.0.48' of git://git.ti.com/ti-linux-kernel/ti-linux-kernel into cm-11.0

This is the 3.0.48 stable release

Conflicts:
	arch/arm/kernel/smp.c
	arch/arm/mach-omap2/opp.c
	drivers/net/tun.c
	drivers/usb/core/hub.c
	kernel/time/timekeeping.c
	net/ipv6/route.c

Change-Id: I18ee7fcae1ee3675f87f2525f1d921b52e6b8ef2