diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-27 10:22:06 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-27 10:22:06 -0700 |
| commit | 55ddf14b04bfe5afaab892a8fb12164b803f1dd5 (patch) | |
| tree | fd6e6f0b9508628fca8d0cadd4ece199201991b2 /drivers/net/3c501.h | |
| parent | a9a0aff5b56d4c40288c000ff09c3f238b6b6fec (diff) | |
| parent | 3014420b6b5d0a6483cf5e56c10df180a33e957e (diff) | |
| download | blackbird-op-linux-55ddf14b04bfe5afaab892a8fb12164b803f1dd5.tar.gz blackbird-op-linux-55ddf14b04bfe5afaab892a8fb12164b803f1dd5.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:
ieee1394: schedule for removal
firewire: core: use separate timeout for each transaction
firewire: core: Fix tlabel exhaustion problem
firewire: core: make transaction label allocation more robust
firewire: core: clean up config ROM related defined constants
ieee1394: mark char device files as not seekable
firewire: cdev: mark char device files as not seekable
firewire: ohci: cleanups and fix for nonstandard build without debug facility
firewire: ohci: wait for PHY register accesses to complete
firewire: ohci: fix up configuration of TI chips
firewire: ohci: enable 1394a enhancements
firewire: ohci: do not clear PHY interrupt status inadvertently
firewire: ohci: add a function for reading PHY registers
Trivial conflicts in Documentation/feature-removal-schedule.txt
Diffstat (limited to 'drivers/net/3c501.h')
0 files changed, 0 insertions, 0 deletions
