Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:
	Documentation/feature-removal-schedule.txt
	drivers/scsi/fcoe/fcoe.c
	net/core/drop_monitor.c
	net/core/net-traces.c

1 files changed, 7 insertions, 7 deletions

diff --git a/drivers/s390/net/Kconfig b/drivers/s390/net/Kconfig
index a7745c82b4a..cb909a5b504 100644
--- a/drivers/s390/net/Kconfig
+++ b/drivers/s390/net/Kconfig
@@ -8,7 +8,7 @@ config LCS
            Select this option if you want to use LCS networking on IBM System z.
            This device driver supports Token Ring (IEEE 802.5),
            FDDI (IEEE 802.7) and Ethernet.
-           To compile as a module, choose M. The module name is lcs.ko.
+           To compile as a module, choose M. The module name is lcs.
            If you do not know what it is, it's safe to choose Y.
 
 config CTCM
@@ -21,7 +21,7 @@ config CTCM
           It also supports virtual CTCs when running under VM.
           This driver also supports channel-to-channel MPC SNA devices.
           MPC is an SNA protocol device used by Communication Server for Linux.
-          To compile as a module, choose M. The module name is ctcm.ko.
+          To compile as a module, choose M. The module name is ctcm.
           To compile into the kernel, choose Y.
           If you do not need any channel-to-channel connection, choose N.
 
@@ -34,7 +34,7 @@ config NETIUCV
           link between VM guests. Using ifconfig a point-to-point connection
           can be established to the Linux on IBM System z
           running on the other VM guest. To compile as a module, choose M.
-          The module name is netiucv.ko. If unsure, choose Y.
+          The module name is netiucv. If unsure, choose Y.
 
 config SMSGIUCV
         tristate "IUCV special message support (VM only)"
@@ -50,7 +50,7 @@ config CLAW
           This driver supports channel attached CLAW devices.
           CLAW is Common Link Access for Workstation.  Common devices
           that use CLAW are RS/6000s, Cisco Routers (CIP) and 3172 devices.
-          To compile as a module, choose M. The module name is claw.ko.
+          To compile as a module, choose M. The module name is claw.
           To compile into the kernel, choose Y.
 
 config QETH
@@ -65,14 +65,14 @@ config QETH
           <http://www.ibm.com/developerworks/linux/linux390>
 
           To compile this driver as a module, choose M.
-          The module name is qeth.ko.
+          The module name is qeth.
 
 config QETH_L2
         tristate "qeth layer 2 device support"
         depends on QETH
         help
           Select this option to be able to run qeth devices in layer 2 mode.
-          To compile as a module, choose M. The module name is qeth_l2.ko.
+          To compile as a module, choose M. The module name is qeth_l2.
           If unsure, choose y.
 
 config QETH_L3
@@ -80,7 +80,7 @@ config QETH_L3
         depends on QETH
         help
           Select this option to be able to run qeth devices in layer 3 mode.
-          To compile as a module choose M. The module name is qeth_l3.ko.
+          To compile as a module choose M. The module name is qeth_l3.
           If unsure, choose Y.
 
 config QETH_IPV6