diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-29 14:41:48 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-29 14:41:48 -0700 |
commit | 7b12887244293eb54acd07c6296b830b3af0f6da (patch) | |
tree | 7af1b624b3248d5a9e38c787f998dc63738b85ab /crypto/vmac.c | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
parent | pata_via: fix VT6410/6415/6330 detection issue (diff) | |
download | linux-dev-7b12887244293eb54acd07c6296b830b3af0f6da.tar.xz linux-dev-7b12887244293eb54acd07c6296b830b3af0f6da.zip |
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:
pata_via: fix VT6410/6415/6330 detection issue
Diffstat (limited to 'crypto/vmac.c')
0 files changed, 0 insertions, 0 deletions