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

Conflicts:
	drivers/net/smsc911x.c

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c
index e610cfe4f07..2f67e9bc2f9 100644
--- a/drivers/pci/hotplug/acpiphp_glue.c
+++ b/drivers/pci/hotplug/acpiphp_glue.c
@@ -585,7 +585,7 @@ static void remove_bridge(acpi_handle handle)
 
         /*
          * On root bridges with hotplug slots directly underneath (ie,
-         * no p2p bridge inbetween), we call cleanup_bridge(). 
+         * no p2p bridge between), we call cleanup_bridge(). 
          *
          * The else clause cleans up root bridges that either had no
          * hotplug slots at all, or had a p2p bridge underneath.