From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Wed, 18 Jul 2007 17:23:37 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Tag: firefly_0821_release~27693
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=31bdc5dc7666aa2fe04c626cea30fe3c20cf481c;p=firefly-linux-kernel-4.4.55.git

Merge branch 'master' of /linux/kernel/git/davem/sparc-2.6

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: Set vio->desc_buf to NULL after freeing.
  [SPARC]: Mark sparc and sparc64 as not having virt_to_bus
  [SPARC64]: Fix reset handling in VNET driver.
  [SPARC64]: Handle reset events in vio_link_state_change().
  [SPARC64]: Handle LDC resets properly in domain-services driver.
  [SPARC64]: Massively simplify VIO device layer and support hot add/remove.
  [SPARC64]: Simplify VNET probing.
  [SPARC64]: Simplify VDC device probing.
  [SPARC64]: Add basic infrastructure for MD add/remove notification.
---

31bdc5dc7666aa2fe04c626cea30fe3c20cf481c