tree 71a0143ae1196d088db354a8620c2efb23f0a062
parent 56d92aa5cf7c96c70f81d0350c94faf46a9fb76d
parent 5da444aae54f64575a60f1d596ed7706e3089fb0
author Linus Torvalds <torvalds@linux-foundation.org> 1349274797 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1349274797 -0700

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

Pull sparc fixes from David Miller:
 "Some quick fixes after today's merge-window pull"

 1) Add missing dependency on Sparc DES driver, oops.  From Dave Jones.

 2) Tell GCC that prom_printf() is printf-like and fix the few
    resultiing warnings.  From Akinobu Mita.

 3) Niagara-2 memcpy doesn't provide it's return value correctly in some
    circumstances.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  sparc: fix format string argument for prom_printf()
  crypto: Build SPARC DES algorithms on SPARC only.
  sparc64: Fix return value of Niagara-2 memcpy.