diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-20 12:41:10 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-20 12:41:10 -0700 |
| commit | d5545fa0056ff2982f8a6419bd9a6ba2674deefd (patch) | |
| tree | f6f4eb4b1d7a4b3b65b2ae58c993bc456facfb45 /drivers/ata/pata_pcmcia.c | |
| parent | 77a189c28b44035ff1b6841df32c43af8a9e8399 (diff) | |
| parent | 9499fe2b340d19ef55c349de794db9d917e7403f (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: Kconfig menu touch-up
firewire: Kconfig menu touch-up
firewire: deadline for PHY config transmission
firewire: fw-ohci: unify printk prefixes
firewire: fill_bus_reset_event needs lock protection
firewire: fw-ohci: write selfIDBufferPtr before LinkControl.rcvSelfID
firewire: fw-ohci: disable PHY packet reception into AR context
firewire: fw-ohci: use of uninitialized data in AR handler
firewire: don't panic on invalid AR request buffer
Diffstat (limited to 'drivers/ata/pata_pcmcia.c')
0 files changed, 0 insertions, 0 deletions