summaryrefslogtreecommitdiffstats
path: root/drivers/pci/hotplug
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-04 18:01:17 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-04 18:01:17 -0700
commit6adae5d9e69743aede91b274224751811f7174f1 (patch)
tree5ad15959313fbf4b7a37a36e40b04ca718b1e423 /drivers/pci/hotplug
parent253f04e78ded827c30f9582489773ebe2adc8924 (diff)
parentf6259deacfd55607ae57cff422d3bc7694ea14e7 (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6: [CRYPTO] padlock: Remove pointless padlock module [CRYPTO] api: Add ablkcipher_request_set_tfm [CRYPTO] cryptd: Add software async crypto daemon [CRYPTO] api: Do not remove users unless new algorithm matches [CRYPTO] cryptomgr: Fix parsing of nested templates [CRYPTO] api: Add async blkcipher type [CRYPTO] templates: Pass type/mask when creating instances [CRYPTO] tcrypt: Use async blkcipher interface [CRYPTO] api: Add async block cipher interface [CRYPTO] api: Proc functions should be marked as unused
Diffstat (limited to 'drivers/pci/hotplug')
0 files changed, 0 insertions, 0 deletions