From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 3 Jun 2010 22:48:15 +0000 (-0700)
Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi... 
X-Git-Tag: Ubuntu-5.10.0-12.13~28083
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=ad8456361fa19068cf49b50a4f98e41b73c08e76;p=mirror_ubuntu-hirsute-kernel.git

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
---

ad8456361fa19068cf49b50a4f98e41b73c08e76