diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-21 17:15:44 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-21 17:15:44 -0700 |
commit | a8251096b427283c47e7d8f9568be6b388dd68ec (patch) | |
tree | edc9747e30b4b4413aa99acfbd3104d81b1c303b /arch/x86/include/asm/pvclock.h | |
parent | 27a3353a4525afe984f3b793681869d636136b69 (diff) | |
parent | 480b02df3aa9f07d1c7df0cd8be7a5ca73893455 (diff) | |
download | linux-a8251096b427283c47e7d8f9568be6b388dd68ec.tar.gz linux-a8251096b427283c47e7d8f9568be6b388dd68ec.tar.bz2 linux-a8251096b427283c47e7d8f9568be6b388dd68ec.zip |
Merge branch 'modules' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
* 'modules' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
module: drop the lock while waiting for module to complete initialization.
MODULE_DEVICE_TABLE(isapnp, ...) does nothing
hisax_fcpcipnp: fix broken isapnp device table.
isapnp: move definitions to mod_devicetable.h so file2alias can reach them.
Diffstat (limited to 'arch/x86/include/asm/pvclock.h')
0 files changed, 0 insertions, 0 deletions