From: Linus Torvalds Date: Tue, 29 Jan 2008 11:45:39 +0000 (+1100) Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux... X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=03bc26cfefd6db756e6bc7fcda11dc17ada7be16;p=openwrt%2Fstaging%2Fblogic.git Merge branch 'master' of git://git./linux/kernel/git/rusty/linux-2.6-for-linus * 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus: Module: check to see if we have a built in module with the same name module: add module taint on ndiswrapper module: fix the module name length in param_sysfs_builtin module: make module_address_lookup safe module: better OOPS and lockdep coverage for loading modules module: Fix gratuitous sprintf in module.c module: wait for dependent modules doing init. module: Don't report discarded init pages as kernel text. --- 03bc26cfefd6db756e6bc7fcda11dc17ada7be16