Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 13 Apr 2009 18:46:04 +0000 (11:46 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 13 Apr 2009 18:46:04 +0000 (11:46 -0700)
commiteebb2afb82c4f999e850d198af26ce6969d0f47a
treefdb0754ab5afac5a5d20b0d225ee9d006f8b78dc
parentb534d388c268ad051c72b187106a3c99021be006
parentf6005354d6d45afeafeca90661911d777c81f1e2
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:
  ata: fix obviously wrong comment
  ahci: force CAP_NCQ for earlier NV MCPs
  [libata] sata_via: kill uninit'd var warning