| commit | 31bdc5dc7666aa2fe04c626cea30fe3c20cf481c | |
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | |
| Wed, 18 Jul 2007 17:23:37 +0000 (18 10:23 -0700) | ||
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | |
| Wed, 18 Jul 2007 17:23:37 +0000 (18 10:23 -0700) | ||
| tree | a1a78a39379e081e9982c3273a71b4e93e8c1fd0 | treesnapshot (tar.gz zip) |
| parent | 5cc97bf2d8eaa6cab60727c3eba3e85e29062669 | commitdiff |
| parent | a5f8967e171a6fa27da8e6d06d3ef85f7fed43c1 | commitdiff |
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.
* '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.