leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge commit 'linus/master' into merge-linus

Browse Source 
Conflicts:

	arch/x86/kvm/i8254.c
This commit is contained in:
Arjan van de Ven
2008-10-17 09:20:26 -07:00
parent 40b8606253 2e532d68a2
commit 651dab4264
6399 changed files with 400538 additions and 207616 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/s390/crypto/ap_bus.c
View File

@@ -892,8 +892,8 @@ static void ap_scan_bus(struct work_struct *unused)
ap_dev->device.bus = &ap_bus_type;
ap_dev->device.parent = ap_root_device;
snprintf(ap_dev->device.bus_id, BUS_ID_SIZE, "card%02x",
AP_QID_DEVICE(ap_dev->qid));
dev_set_name(&ap_dev->device, "card%02x",
AP_QID_DEVICE(ap_dev->qid));
ap_dev->device.release = ap_device_release;
rc = device_register(&ap_dev->device);
if (rc) {