Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 10 Oct 2012 02:12:03 +0000 (11:12 +0900)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 10 Oct 2012 02:12:03 +0000 (11:12 +0900)
commit23d5385f382a7c7d8b6bf19b0c2cfb3acbb12d31
treeb0e2fbbdd8a9b86e0074affd58e35bea9c22e175
parentb7e97d22113bcaafff93774e3085f5b567eaba9c
parent9836d3458cde82626f2828ca6bd44c4a02b56e63
Merge git://git./linux/kernel/git/davem/sparc

Pull sparc update from David Miller:
 "This is just the UAPI commits for sparc via David Howells."

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  UAPI: (Scripted) Disintegrate arch/sparc/include/asm