Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 16 Jun 2012 00:07:06 +0000 (17:07 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 16 Jun 2012 00:07:06 +0000 (17:07 -0700)
commit06da03510e0cf669a2c434484b90c0ab09d2b086
tree583744f34d2ddb3ff879aff7ab0d4b1109fd655d
parentc83119a980166539bc14033d89e83cd2e4f2da52
parent8a51178ed64dca418478996697611ef087fa22df
Merge git://git./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