Merge branch 'modules' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 22 May 2010 00:15:44 +0000 (17:15 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 22 May 2010 00:15:44 +0000 (17:15 -0700)
commita8251096b427283c47e7d8f9568be6b388dd68ec
treeedc9747e30b4b4413aa99acfbd3104d81b1c303b
parent27a3353a4525afe984f3b793681869d636136b69
parent480b02df3aa9f07d1c7df0cd8be7a5ca73893455
Merge branch 'modules' of git://git./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.
include/linux/mod_devicetable.h
kernel/module.c
scripts/mod/file2alias.c