diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-08 02:09:24 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-08 02:09:24 +0200 |
| commit | 2d53056973079e6c2ffc0d7ae3afbdd3d4f18ae3 (patch) | |
| tree | e921596d80cd0a6434629dbd8d22c0ca3ec14b88 /MAINTAINERS | |
| parent | Merge branch 'acpica' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/l... (diff) | |
| parent | Merge firewire branches to be released post v2.6.35 (diff) | |
| download | linux-2d53056973079e6c2ffc0d7ae3afbdd3d4f18ae3.tar.xz linux-2d53056973079e6c2ffc0d7ae3afbdd3d4f18ae3.zip | |
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: (82 commits)
firewire: core: add forgotten dummy driver methods, remove unused ones
firewire: add isochronous multichannel reception
firewire: core: small clarifications in core-cdev
firewire: core: remove unused code
firewire: ohci: release channel in error path
firewire: ohci: use memory barriers to order descriptor updates
tools/firewire: nosy-dump: increment program version
tools/firewire: nosy-dump: remove unused code
tools/firewire: nosy-dump: use linux/firewire-constants.h
tools/firewire: nosy-dump: break up a deeply nested function
tools/firewire: nosy-dump: make some symbols static or const
tools/firewire: nosy-dump: change to kernel coding style
tools/firewire: nosy-dump: work around segfault in decode_fcp
tools/firewire: nosy-dump: fix it on x86-64
tools/firewire: add userspace front-end of nosy
firewire: nosy: note ioctls in ioctl-number.txt
firewire: nosy: use generic printk macros
firewire: nosy: endianess fixes and annotations
firewire: nosy: annotate __user pointers and __iomem pointers
firewire: nosy: fix device shutdown with active client
...
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 1349d1cb5aca..3f49df2d977e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2324,6 +2324,7 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git S: Maintained F: drivers/firewire/ F: include/linux/firewire*.h +F: tools/firewire/ FIRMWARE LOADER (request_firmware) S: Orphan |