tree 394733989d9f68e8380ace4948976a92336e6b16
parent e87e7be92979480ee5a2d4a746dc88f2eeca79ca
parent 6a328f3fe042396c6525d7bf84cfd941440cc045
author Linus Torvalds <torvalds@linux-foundation.org> 1384905003 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1384905003 -0800

Merge git://git.kernel.org/pub/scm/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