tree 281c96054fa2a8ca42ac47a4edfa6961cc463f29
parent 39d112100e561686ab1e2b19c57984163ad6c1fa
parent d8d9129ea28e2177749627c82962feb26e8d11e9
author Linus Torvalds <torvalds@linux-foundation.org> 1275605295 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1275605295 -0700

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