diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-08 01:59:43 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-08 01:59:43 +0200 |
commit | 7b51ba38d9baca207152d1c97ec793cfb673a6cd (patch) | |
tree | 581d9340f2bca78e755469611c224b050d439f59 /crypto/tcrypt.c | |
parent | [UML] fix gcc ICEs and unresolved externs (diff) | |
parent | Revert "PCI: Correct last two HP entries in the bfsort whitelist" (diff) | |
download | linux-7b51ba38d9baca207152d1c97ec793cfb673a6cd.tar.xz linux-7b51ba38d9baca207152d1c97ec793cfb673a6cd.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
Revert "PCI: Correct last two HP entries in the bfsort whitelist"
Diffstat (limited to 'crypto/tcrypt.c')
0 files changed, 0 insertions, 0 deletions