Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs into for-2.6.34-incoming

Resolve merge conflict in fs/xfs/linux-2.6/xfs_export.c.

1 files changed, 2 insertions, 2 deletions

diff --git a/arch/sparc/kernel/central.c b/arch/sparc/kernel/central.c
index f3b5466c389c..4589ca33220f 100644
--- a/arch/sparc/kernel/central.c
+++ b/arch/sparc/kernel/central.c
@@ -99,7 +99,7 @@ static int __devinit clock_board_probe(struct of_device *op,
 
         p->leds_resource.start = (unsigned long)
                 (p->clock_regs + CLOCK_CTRL);
-        p->leds_resource.end = p->leds_resource.end;
+        p->leds_resource.end = p->leds_resource.start;
         p->leds_resource.name = "leds";
 
         p->leds_pdev.name = "sunfire-clockboard-leds";
@@ -194,7 +194,7 @@ static int __devinit fhc_probe(struct of_device *op,
         if (!p->central) {
                 p->leds_resource.start = (unsigned long)
                         (p->pregs + FHC_PREGS_CTRL);
-                p->leds_resource.end = p->leds_resource.end;
+                p->leds_resource.end = p->leds_resource.start;
                 p->leds_resource.name = "leds";
 
                 p->leds_pdev.name = "sunfire-fhc-leds";