From: David S. Miller Date: Mon, 28 May 2012 04:14:48 +0000 (-0700) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux X-Git-Tag: upstream/snapshot3+hdmi~7328^2~24 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c2e1ff39c106ab026e3feb29c038855b7ed00393;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git Merge git://git./linux/kernel/git/torvalds/linux Pull in Linus's tree to get the commits that blew away ARCH_USES_GETTIMEOFFSET but didn't update Sparc correctly, so that I can apply Stephen Rothwell's fix for that mis-merge. Signed-off-by: David S. Miller --- c2e1ff39c106ab026e3feb29c038855b7ed00393