diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-22 14:49:48 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-22 14:49:48 -0700 |
| commit | 441c196e84b11aad3123baa9320eee7abc6b5c98 (patch) | |
| tree | ea51d689c9ac09cce10a5758f19d6adbd8a7a9d7 /drivers/net/mlx4/main.c | |
| parent | 951cc93a7493a81a47e20231441bc6cf17c98a37 (diff) | |
| parent | 9a00c24ae7cb08dcd46edf1327a47871e8466444 (diff) | |
| download | linux-441c196e84b11aad3123baa9320eee7abc6b5c98.tar.bz2 | |
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
Diffstat (limited to 'drivers/net/mlx4/main.c')
0 files changed, 0 insertions, 0 deletions