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

Conflicts:
	drivers/net/smsc911x.c

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/xen/events.c b/drivers/xen/events.c
index 036343ba204e..42d6c930cc87 100644
--- a/drivers/xen/events.c
+++ b/drivers/xen/events.c
@@ -5,7 +5,7 @@
  * domain gets 1024 event channels, but NR_IRQ is not that large, we
  * must dynamically map irqs<->event channels.  The event channels
  * interface with the rest of the kernel by defining a xen interrupt
- * chip.  When an event is recieved, it is mapped to an irq and sent
+ * chip.  When an event is received, it is mapped to an irq and sent
  * through the normal interrupt processing path.
  *
  * There are four kinds of events which can be mapped to an event
@@ -416,7 +416,7 @@ static int __must_check xen_allocate_irq_dynamic(void)
 #ifdef CONFIG_X86_IO_APIC
         /*
          * For an HVM guest or domain 0 which see "real" (emulated or
-         * actual repectively) GSIs we allocate dynamic IRQs
+         * actual respectively) GSIs we allocate dynamic IRQs
          * e.g. those corresponding to event channels or MSIs
          * etc. from the range above those "real" GSIs to avoid
          * collisions.