diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-27 08:32:37 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-27 08:32:37 +0200 |
| commit | b96d71571f7745216ef63f13770b5a10b94ddd34 (patch) | |
| tree | 77369180dfdbde029104e26210fdbf13fc4db3e7 /drivers/net/ethernet/jme.c | |
| parent | 138c4ae9cfda8fdcf9e137457853b09ef8cf8f77 (diff) | |
| parent | a0da19149f589e3e6fd5bab527b3326368ab92bc (diff) | |
Merge branch 'upstream-linus' of git://github.com/jgarzik/libata-dev
* 'upstream-linus' of git://github.com/jgarzik/libata-dev: (50 commits)
pata_efar: fix register naming used in efar_set_piomode()
pata_rdc: add Power Management support
ata_piix: unify code for programming PIO and MWDMA timings
ata_piix: SITRE handling fix
libata: make ata_sff_data_xfer_noirq() work with 32-bit PIO
pata_artop: add Power Management support
pata_sl82c105: add Power Management support
pata_pdc2027x: add Power Management support
pata_legacy: use PIO mask defines
pata_legacy: unify QDI ->set_piomode methods
libata: remove no longer needed pata_qdi driver
pata_it8213: fix register naming used in it8213_set_piomode()
pata_it8213: add UDMA100 and UDMA133 support
pata_rdc: parallel scanning needs an extra locking
pata_via: add via_fixup()
libata: ata_timing_compute() fixup
pata_scc: add proper cable detection method
pata_arasan_cf: remove bogus to_platform_device() calls
pata_atiixp: add proper ->prereset method
pata_serverworks: add serverworks_fixup()
...
Diffstat (limited to 'drivers/net/ethernet/jme.c')
0 files changed, 0 insertions, 0 deletions