Merge branch 'linux-omap-3.0' into experimental

Conflicts:
	drivers/net/tun.c
	kernel/time/timekeeping.c
	scripts/Kbuild.include