]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 19 Aug 2008 20:56:21 +0000 (13:56 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 19 Aug 2008 20:56:21 +0000 (13:56 -0700)
commit395c68464cffbc645919a93d6111bc15201167f3
tree7a58728236ac599c8121a7975e2293caeea9b02b
parentddd13dc606ea1a06f2cf7d11dc06418de3e28121
parent30b0aa7c9a5e769a874a456cd56396eebf164b91
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: Kconfig help update
  ieee1394: sbp2: let nodemgr retry node updates during bus reset series
  ieee1394: don't drop nodes during bus reset series
  ieee1394: regression in 2.6.25: updates should happen before probes