From: Linus Torvalds Date: Sat, 22 May 2010 00:15:44 +0000 (-0700) Subject: Merge branch 'modules' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux... X-Git-Tag: v2.6.35-rc1~437 X-Git-Url: https://bbs.cooldavid.org/git/?a=commitdiff_plain;h=a8251096b427283c47e7d8f9568be6b388dd68ec;p=net-next-2.6.git 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. --- a8251096b427283c47e7d8f9568be6b388dd68ec