diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-08 10:22:01 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-08 10:22:01 -0700 |
commit | 83d5a325107cd0befa2b863e795675bc8ff881d7 (patch) | |
tree | 64cd1a69d726b19e70783f2b350baf3f8aa38489 /include/linux/atmel_serial.h | |
parent | d0cdb070ced5453fd1790d83c32bdc59d8ff9375 (diff) | |
parent | 968e594afdbc40b4270f9d4032ae8350475749d6 (diff) | |
download | blackbird-op-linux-83d5a325107cd0befa2b863e795675bc8ff881d7.tar.gz blackbird-op-linux-83d5a325107cd0befa2b863e795675bc8ff881d7.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: Don't trust current capacity values in identify words 57-58
libata: make sure port is thawed when skipping resets
sata_nv: fix module parameter description
ahci: Add the Device IDs for MCP89 and remove IDs of MCP7B to/from ahci.c
libata: don't use on-stack sense buffer
libata: align ap->sector_buf
libata: fix dma_unmap_sg misuse
libata: change drive ready wait after hard reset to 5s
Diffstat (limited to 'include/linux/atmel_serial.h')
0 files changed, 0 insertions, 0 deletions