Linus Torvalds 4457e6f6c9 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

2013-11-19 15:50:03 -08:00

..

asm

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

2013-11-19 15:50:03 -08:00

uapi/asm

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

2013-11-13 17:40:34 +09:00