diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-07 16:59:43 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-07 16:59:43 -0700 |
commit | 7b51ba38d9baca207152d1c97ec793cfb673a6cd (patch) | |
tree | 581d9340f2bca78e755469611c224b050d439f59 /crypto/proc.c | |
parent | 4f81c5350b44bcc501ab6f8a089b16d064b4d2f6 (diff) | |
parent | 739db07f82767e7634176d18af2acbe77b11fd42 (diff) | |
download | linux-7b51ba38d9baca207152d1c97ec793cfb673a6cd.tar.gz linux-7b51ba38d9baca207152d1c97ec793cfb673a6cd.tar.bz2 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/proc.c')
0 files changed, 0 insertions, 0 deletions