summaryrefslogtreecommitdiffstats
path: root/drivers/cdrom/cdrom.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-08-14 14:58:22 +0200
committerIngo Molnar <mingo@elte.hu>2008-08-14 14:58:22 +0200
commitc83d12806b6185131ece682de8696d8cfb78df69 (patch)
tree6eb639a6746b0e3c2aa1e57f3a9ee5eea6dfc793 /drivers/cdrom/cdrom.c
parent51ca3c679194e7435c25b8e77b0a73c597e41ae9 (diff)
parent8d7ccaa545490cdffdfaff0842436a8dd85cf47b (diff)
parent8067794bec1cc5de1431102cf0a6a1c7ce75cd85 (diff)
parenta677f58a8c8c541bf7d02c658545084040f3708d (diff)
downloadkernel-crypto-c83d12806b6185131ece682de8696d8cfb78df69.tar.gz
kernel-crypto-c83d12806b6185131ece682de8696d8cfb78df69.tar.xz
kernel-crypto-c83d12806b6185131ece682de8696d8cfb78df69.zip
Merge branches 'x86/prototypes', 'x86/x2apic' and 'x86/debug' into x86/core