| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Fri, 22 Jul 2011 21:49:48 +0000 (14:49 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Fri, 22 Jul 2011 21:49:48 +0000 (14:49 -0700) | ||
| commit | 441c196e84b11aad3123baa9320eee7abc6b5c98 | |
| tree | ea51d689c9ac09cce10a5758f19d6adbd8a7a9d7 | tree | snapshot (tar.xz tar.gz zip) |
| parent | 951cc93a7493a81a47e20231441bc6cf17c98a37 | commit | diff |
| parent | 9a00c24ae7cb08dcd46edf1327a47871e8466444 | commit | 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: document the sysfs ABIs
firewire: cdev: ABI documentation enhancements
firewire: cdev: prevent race between first get_info ioctl and bus reset event queuing
firewire: cdev: return -ENOTTY for unimplemented ioctls, not -EINVAL
firewire: ohci: skip soft reset retries after card ejection
firewire: ohci: fix PHY reg access after card ejection
firewire: ohci: add a comment on PHY reg access serialization
firewire: ohci: reduce potential context_stop latency
firewire: ohci: remove superfluous posted write flushes
firewire: net: replacing deprecated __attribute__((packed)) with __packed
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
firewire: document the sysfs ABIs
firewire: cdev: ABI documentation enhancements
firewire: cdev: prevent race between first get_info ioctl and bus reset event queuing
firewire: cdev: return -ENOTTY for unimplemented ioctls, not -EINVAL
firewire: ohci: skip soft reset retries after card ejection
firewire: ohci: fix PHY reg access after card ejection
firewire: ohci: add a comment on PHY reg access serialization
firewire: ohci: reduce potential context_stop latency
firewire: ohci: remove superfluous posted write flushes
firewire: net: replacing deprecated __attribute__((packed)) with __packed
| drivers/firewire/net.c | diff1 | | diff2 | | blob | history |
| drivers/firewire/ohci.c | diff1 | | diff2 | | blob | history |