diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-27 13:22:06 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-27 13:22:06 -0400 |
| commit | 55ddf14b04bfe5afaab892a8fb12164b803f1dd5 (patch) | |
| tree | fd6e6f0b9508628fca8d0cadd4ece199201991b2 /Documentation | |
| parent | a9a0aff5b56d4c40288c000ff09c3f238b6b6fec (diff) | |
| parent | 3014420b6b5d0a6483cf5e56c10df180a33e957e (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:
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 'Documentation')
| -rw-r--r-- | Documentation/feature-removal-schedule.txt | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt index a86152ae2f6f..672be0109d02 100644 --- a/Documentation/feature-removal-schedule.txt +++ b/Documentation/feature-removal-schedule.txt | |||
| @@ -646,3 +646,13 @@ Who: Thomas Gleixner <tglx@linutronix.de> | |||
| 646 | 646 | ||
| 647 | ---------------------------- | 647 | ---------------------------- |
| 648 | 648 | ||
| 649 | What: old ieee1394 subsystem (CONFIG_IEEE1394) | ||
| 650 | When: 2.6.37 | ||
| 651 | Files: drivers/ieee1394/ except init_ohci1394_dma.c | ||
| 652 | Why: superseded by drivers/firewire/ (CONFIG_FIREWIRE) which offers more | ||
| 653 | features, better performance, and better security, all with smaller | ||
| 654 | and more modern code base | ||
| 655 | Who: Stefan Richter <stefanr@s5r6.in-berlin.de> | ||
| 656 | |||
| 657 | ---------------------------- | ||
| 658 | |||