Merge mainline v2.6.27-rc2 tree into linux-omap tree