Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 19 Nov 2013 23:50:03 +0000 (15:50 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 19 Nov 2013 23:50:03 +0000 (15:50 -0800)
commit4457e6f6c9f6052cd5f44a79037108b5ddeb0ce7
tree394733989d9f68e8380ace4948976a92336e6b16
parente87e7be92979480ee5a2d4a746dc88f2eeca79ca
parent6a328f3fe042396c6525d7bf84cfd941440cc045
Merge git://git./linux/kernel/git/davem/sparc

Pull sparc fixes from David Miller:
 "Two merge window fallout build fixes"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  sparc64: merge fix
  sparc64: fix build regession