diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-01 09:34:23 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-01 09:34:23 -0800 |
commit | 6a1214113090905aca6a492fc8ef10d84c608a69 (patch) | |
tree | 83e0b825725ff23b3c8f15761f0ec9472ecc082c /fs/ocfs2 | |
parent | c07f62e5f18123103459ff74e86af1518a5b8af5 (diff) | |
parent | 2642b11295ebcc94843045933061bfbb263fce7f (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:
ieee1394: sbp2: fix race condition in state change
ieee1394: fix list corruption (reported at module removal)
firewire: fw-sbp2: another iPod mini quirk entry
ieee1394: sbp2: another iPod mini quirk entry
Diffstat (limited to 'fs/ocfs2')
0 files changed, 0 insertions, 0 deletions