Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
authorDavid S. Miller <davem@davemloft.net>
Mon, 28 May 2012 04:14:48 +0000 (21:14 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 28 May 2012 04:14:48 +0000 (21:14 -0700)
commitc2e1ff39c106ab026e3feb29c038855b7ed00393
treee0255b5b9aed8645edc4426f2d4972280910e065
parent456d3d42460c1fc20ba0d27442443fcd63aaac35
parentb48b2c3e50433ff6f7e46186daa7f986bd960215
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 <davem@davemloft.net>