small fixex and tweaks

Conflicts:
	arch/arm/mach-omap2/omap_phy_tune.c
	kernel/time/tick-broadcast.c
	mm/hugetlb.c
	security/keys/keyctl.c

Change-Id: Idfad6bed3cddccc05f95725238f5a2821820f6d4