tree eedba8710d0ba3c802ecf77f46ed6ab2c73e2149
parent eff2502801e9a3a34882c6bd720470d65394522e
parent 770a424112cb2c3a3e39221299eaf5244b76479a
author Linus Torvalds <torvalds@linux-foundation.org> 1225464771 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1225464771 -0700

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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  sparc64: Add missing null terminating entry to bq4802_match[].
  sparc: use the new byteorder headers
  rtc-m48t59: shift zero year to 1968 on sparc (rev 2)
  dbri: check dma_alloc_coherent errors
  sparc64: remove byteshifting from out* helpers