From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Thu, 18 Oct 2007 21:39:44 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Tag: v2.6.24-rc1~295
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=9cf52b2921fbe62566b6b2ee79f71203749c9e5e;p=~shefty%2Frdma-dev.git

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.
---

9cf52b2921fbe62566b6b2ee79f71203749c9e5e