git » linux-kernel » commit a825109

Merge branch 'modules' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus

author Linus Torvalds
2010-05-22 00:15:44 UTC
committer Linus Torvalds
2010-05-22 00:15:44 UTC
parent 27a3353a4525afe984f3b793681869d636136b69
parent 480b02df3aa9f07d1c7df0cd8be7a5ca73893455
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.