tree e4a9b4035210bde6d21c70f59371da0882aebcba
parent b4fe2a03422e6bd20bd8df5e428109a85c9ea961
parent 595a251c0740785fd3c0d2156d78578c7479811e
author Linus Torvalds <torvalds@linux-foundation.org> 1292376840 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1292376840 -0800

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:
  sparc: Write to prom console using indirect buffer.
  sparc: Delete prom_*getchar().
  sparc: Pass buffer pointer all the way down to prom_{get,put}char().
  sparc: Do not export prom_nb{get,put}char().
  sparc64: Delete prom_setcallback().
  sparc64: Unexport prom_service_exists().
  sparc: Kill prom devops_{32,64}.c
  sparc: Remove prom_pathtoinode()
  sparc64: Delete prom_puts() unused.
  SPARC/LEON: removed constant timer initialization as if HZ=100, now it reflects the value of HZ