Merge branches 'upstream' and 'upstream-fixes' into for-linus
[linux-2.6] / include / linux / cdk.h
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2