]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commitdiff
projects / mirror_ubuntu-zesty-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 456d3d4 b48b2c3)
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)
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>

Trivial merge
ubuntu-zesty-kernel mirror