summaryrefslogtreecommitdiffstats
path: root/drivers/net/hamachi.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-09-05 14:59:00 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-09-05 14:59:00 -0700
commitf815c335d21f9965f8dbe142fd168aaba1baf98e (patch)
tree4e9a65b7810de10141595125cc65f2b0e7533dfc /drivers/net/hamachi.c
parent74a01180db4bbfd61304ae0ba1f60af55ffc803d (diff)
parentbaed6b82d9f160184c1c14cdb4accb08f3eb6b87 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6: firewire: sbp2: fix freeing of unallocated memory firewire: ohci: fix Ricoh R5C832, video reception firewire: ohci: fix Agere FW643 and multiple cameras firewire: core: fix crash in iso resource management
Diffstat (limited to 'drivers/net/hamachi.c')
0 files changed, 0 insertions, 0 deletions