diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-19 11:59:49 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-19 11:59:49 -0800 |
| commit | 6656b3fc8aba2eb7ca00c06c7fe4917938b0b652 (patch) | |
| tree | 75516a951a337809f5548cc19204fd2d33cfffae /security/keys | |
| parent | 33e0d57f5d2f079104611be9f3fccc27ef2c6b24 (diff) | |
| parent | b1353e4f40f6179ab26a3bb1b2e1fe29ffe534f5 (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:
sata_via: apply magic FIFO fix to vt6420 too
Diffstat (limited to 'security/keys')
0 files changed, 0 insertions, 0 deletions