diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-01 08:28:15 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-01 08:28:15 -0700 |
| commit | f285e3d329ce68cc355fadf4ab2c8f34d7f264cb (patch) | |
| tree | a40ae43a277bedeec732fd20eee166990974fb58 /arch/m68k/hp300 | |
| parent | c1a834dc704763673df10282995257f2de93cbe9 (diff) | |
| parent | ca9a7af35f1ce4a990c6c3aace65ed36f89d50bf (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: Install firewire-constants.h and firewire-cdev.h for userspace.
firewire: Change struct fw_cdev_iso_packet to not use bitfields.
firewire: Implement suspend/resume PCI driver hooks.
firewire: add to MAINTAINERS
firewire: fw-sbp2: implement sysfs ieee1394_id
ieee1394: sbp2: offer SAM-conforming target port ID in sysfs
ieee1394: fix calculation of sysfs attribute "address"
Diffstat (limited to 'arch/m68k/hp300')
0 files changed, 0 insertions, 0 deletions