diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-20 14:31:27 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-20 14:31:27 -0700 |
| commit | 557eed603159b4e007c57d97fad1333ecebd3c2e (patch) | |
| tree | ae784d4578da59617f87e36728ed2cafb2be50d6 /net/mac80211 | |
| parent | be84bfcc3ed8f824751ab79349779e50cc98aa01 (diff) | |
| parent | 8a745f1f39b7a20047a362b67ce9151c07d14440 (diff) | |
| download | blackbird-op-linux-557eed603159b4e007c57d97fad1333ecebd3c2e.tar.gz blackbird-op-linux-557eed603159b4e007c57d97fad1333ecebd3c2e.zip | |
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
libata: Power off empty ports
libata-pmp: add support for Thermaltake BlackX Duet esata drive dock
ATA: Don't powerdown Compaq Triflex IDE device on suspend
libata: Use Maximum Write Same Length to report discard size limit
drivers/ata/acard-ahci.c: fix enum warning
pata_at91: SMC settings calculation bugfixes, support for t6z and IORDY
libata-sff: prevent irq descriptions for dummy ports
pata_cm64x: fix boot crash on parisc
Diffstat (limited to 'net/mac80211')
0 files changed, 0 insertions, 0 deletions
