| commit | 395c68464cffbc645919a93d6111bc15201167f3 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Aug 19 13:56:21 2008 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Aug 19 13:56:21 2008 -0700 |
| tree | 7a58728236ac599c8121a7975e2293caeea9b02b | |
| parent | ddd13dc606ea1a06f2cf7d11dc06418de3e28121 [diff] | |
| parent | 30b0aa7c9a5e769a874a456cd56396eebf164b91 [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: 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