diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-20 21:37:55 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-20 21:37:55 +0200 |
| commit | fdfe6d3d000775b50fb1adbc278ba0a34c3007c7 (patch) | |
| tree | 1d8f90f6be657cd7de16692474d9e85d7bc2f92d /crypto/salsa20_generic.c | |
| parent | Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
| parent | [agp]: fixup chipset flush for new Intel G4x. (diff) | |
| download | linux-fdfe6d3d000775b50fb1adbc278ba0a34c3007c7.tar.xz linux-fdfe6d3d000775b50fb1adbc278ba0a34c3007c7.zip | |
Merge branch 'agp-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6
* 'agp-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6:
[agp]: fixup chipset flush for new Intel G4x.
agp: brown paper bag patch - put back the two lines it took out.
Diffstat (limited to 'crypto/salsa20_generic.c')
0 files changed, 0 insertions, 0 deletions