diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-04 00:48:15 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-04 00:48:15 +0200 |
commit | ad8456361fa19068cf49b50a4f98e41b73c08e76 (patch) | |
tree | 281c96054fa2a8ca42ac47a4edfa6961cc463f29 /sound/pci/asihpi/asihpi.c | |
parent | Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/ke... (diff) | |
parent | libata: implement on-demand HPA unlocking (diff) | |
download | linux-ad8456361fa19068cf49b50a4f98e41b73c08e76.tar.xz linux-ad8456361fa19068cf49b50a4f98e41b73c08e76.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: implement on-demand HPA unlocking
libata: use the enlarged capacity after late HPA unlock
SCSI: implement sd_unlock_native_capacity()
libata-sff: trivial corrections to Kconfig help text
sata_nv: don't diddle with nIEN on mcp55
sata_via: magic vt6421 fix for transmission problems w/ WD drives
Diffstat (limited to 'sound/pci/asihpi/asihpi.c')
0 files changed, 0 insertions, 0 deletions