diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-14 16:49:41 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-14 16:49:41 -0700 |
| commit | 4faa8496650f9417189dacce8f933e8ec61dc032 (patch) | |
| tree | 0ce85598eefccb69933dfb31106265d11a4b4919 /kernel/wait.c | |
| parent | b663c6fd98c9cf586279db03cec3257c413efd00 (diff) | |
| parent | f5101d58afc528c1d0c863fe03cd2d607766c4a1 (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: fw-ohci: shut up false compiler warning on PPC32
firewire: fw-ohci: use dma_alloc_coherent for ar_buffer
ieee1394: sbp2: fix for SYM13FW500 bridge (Datafab disk)
firewire: fw-sbp2: fix for SYM13FW500 bridge (Datafab disk)
firewire: update Kconfig help text
firewire: warn on fatal condition in topology code
firewire: fw-sbp2: set single-phase retry_limit
firewire: fw-ohci: Apple UniNorth 1st generation support
firewire: fw-ohci: PPC PMac platform code
firewire: endianess annotations
firewire: endianess fix
Diffstat (limited to 'kernel/wait.c')
0 files changed, 0 insertions, 0 deletions