projects / profile / ivi / kernel-x86-ivi.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 39d1121 d8d9129)
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 3 Jun 2010 22:48:15 +0000 (15:48 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 3 Jun 2010 22:48:15 +0000 (15:48 -0700)
commitad8456361fa19068cf49b50a4f98e41b73c08e76
tree281c96054fa2a8ca42ac47a4edfa6961cc463f29tree | snapshot
parent39d112100e561686ab1e2b19c57984163ad6c1facommit | diff
parentd8d9129ea28e2177749627c82962feb26e8d11e9commit | diff
Merge branch 'upstream-linus' of git://git./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
Domain: System / Uncategorized;