aboutsummaryrefslogtreecommitdiffstats
path: root/fs/sysfs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-02-15 19:54:54 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-02-15 19:54:54 -0800
commit382640b3372405c40b7646c68a50ca91358027e4 (patch)
tree714ed8ce3ffacd397ed6061f6593bd863180fc78 /fs/sysfs
parentMerge branch 'fix/hda' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 (diff)
parentfirewire: ohci: retransmit isochronous transmit packets on cycle loss (diff)
downloadlinux-dev-382640b3372405c40b7646c68a50ca91358027e4.tar.xz
linux-dev-382640b3372405c40b7646c68a50ca91358027e4.zip
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: ohci: retransmit isochronous transmit packets on cycle loss firewire: net: fix panic in fwnet_write_complete
Diffstat (limited to 'fs/sysfs')
0 files changed, 0 insertions, 0 deletions