tree 5705ab0af0adfb7043407b5a4ffbf43fcbff42bd
parent 952184304fbf030f0133d8b66a91b2847dce729e
parent 5c45708352a040f19caceb683c78bc86aad466f6
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1192743584 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1192743584 -0700

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC/64]: Consolidate of_register_driver
  [SPARC] Videopix Frame Grabber: Convert device_lock_sem to mutex
  [SPARC]: Support for new termios.
  [SPARC64]: Check of_get_property() return in pci_determine_mem_io_space().
  [SPARC64]: Fix boot failures due to bootmem.
  [SPARC64]: Implement atomic backoff.