| commit | eebb2afb82c4f999e850d198af26ce6969d0f47a | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Apr 13 11:46:04 2009 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Apr 13 11:46:04 2009 -0700 |
| tree | fdb0754ab5afac5a5d20b0d225ee9d006f8b78dc | |
| parent | b534d388c268ad051c72b187106a3c99021be006 [diff] | |
| parent | f6005354d6d45afeafeca90661911d777c81f1e2 [diff] |
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: ata: fix obviously wrong comment ahci: force CAP_NCQ for earlier NV MCPs [libata] sata_via: kill uninit'd var warning