diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-10 10:02:17 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-10 10:02:17 -0800 |
| commit | cdcb30b5cca157ff73892900ac309d5ee4151c04 (patch) | |
| tree | 4502487917ca7b677cac4e5496001a1abc981478 /kernel/marker.c | |
| parent | c1ab6cc68cb7d512ebba3496cd341286d2d7969d (diff) | |
| parent | 1d1dc5e83f3299c108a4e44d58cc4bfef48c876a (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: fw-ohci: fix IOMMU resource exhaustion
ieee1394: node manager causes up to ~3.25s delay in freezing tasks
Diffstat (limited to 'kernel/marker.c')
0 files changed, 0 insertions, 0 deletions