2ecc082c
parent c07f62e5f18123103459ff74e86af1518a5b8af5
parent 2642b11295ebcc94843045933061bfbb263fce7f
author Linus Torvalds <torvalds@linux-foundation.org> 1228152863 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1228152863 -0800

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
qòÞ6›