tree 3a37d1b7d0a500de78999e956f6311575cf9c5b5
parent f52b69f86e27903d6896ed5fa7cd280fec8de532
parent 8befc9f23c695395de011ced289c611fada22f35
author Linus Torvalds <torvalds@linux-foundation.org> 1333130171 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1333130171 -0700

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

Pull minor Sparc fixes from David Miller:
 "This just fixes build fallout due to recent changes that went int your
  tree."

Sam Ravnborg says that sparc32 still needs some more tender loving.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  sparc: Fix even more fallout from system.h split.
  sparc: fix fallout from system.h split