tree 583744f34d2ddb3ff879aff7ab0d4b1109fd655d
parent c83119a980166539bc14033d89e83cd2e4f2da52
parent 8a51178ed64dca418478996697611ef087fa22df
author Linus Torvalds <torvalds@linux-foundation.org> 1339805226 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1339805226 -0700

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc

Pull sparc update from David S. Miller:
 "This just removes some sparc headers that were never, ever, used."

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  sparc: remove two unused headers