summaryrefslogtreecommitdiffstats
path: root/net/irda/irlap.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-18 19:23:37 +0200
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-18 19:23:37 +0200
commit31bdc5dc7666aa2fe04c626cea30fe3c20cf481c (patch)
treea1a78a39379e081e9982c3273a71b4e93e8c1fd0 /net/irda/irlap.c
parentMerge branch 'xen-upstream' of ssh://master.kernel.org/pub/scm/linux/kernel/g... (diff)
parent[SPARC64]: Set vio->desc_buf to NULL after freeing. (diff)
downloadlinux-31bdc5dc7666aa2fe04c626cea30fe3c20cf481c.tar.xz
linux-31bdc5dc7666aa2fe04c626cea30fe3c20cf481c.zip
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: [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.
Diffstat (limited to 'net/irda/irlap.c')
0 files changed, 0 insertions, 0 deletions