Merge branch 'modules' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux...

* '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.

diff --cc include/linux/mod_devicetable.h
Simple merge

diff --cc kernel/module.c
Simple merge

diff --cc scripts/mod/file2alias.c
Simple merge