From: Andrew Morton <akpm@linux-foundation.org>

can't be bothered unpicking this one.

Cc: David Brownell <david-b@pacbell.net>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 arch/powerpc/sysdev/fsl_soc.c |    4 ----
 drivers/spi/spidev.c          |   28 ++++++++++++++--------------
 2 files changed, 14 insertions(+), 18 deletions(-)

diff -puN arch/powerpc/sysdev/fsl_soc.c~linux-next-git-rejects arch/powerpc/sysdev/fsl_soc.c
--- a/arch/powerpc/sysdev/fsl_soc.c~linux-next-git-rejects
+++ a/arch/powerpc/sysdev/fsl_soc.c
@@ -432,12 +432,8 @@ static struct i2c_driver_device i2c_devi
 	{"dallas,ds1339",  "ds1339"},
 	{"dallas,ds1340",  "ds1340"},
 	{"stm,m41t00",     "m41t00"},
-<<<<<<< HEAD:arch/powerpc/sysdev/fsl_soc.c
-	{"dallas,ds1374",  "ds1374"},
-=======
 	{"dallas,ds1374",  "rtc-ds1374"},
 	{"cirrus,cs4270",  "cs4270"},
->>>>>>> FETCH_HEAD:arch/powerpc/sysdev/fsl_soc.c
 };
 
 static int __init of_find_i2c_driver(struct device_node *node,
diff -puN drivers/spi/spidev.c~linux-next-git-rejects drivers/spi/spidev.c
--- a/drivers/spi/spidev.c~linux-next-git-rejects
+++ a/drivers/spi/spidev.c
@@ -575,20 +575,20 @@ static int spidev_probe(struct spi_devic
 	mutex_lock(&device_list_lock);
 	minor = find_first_zero_bit(minors, N_SPI_MINORS);
 	if (minor < N_SPI_MINORS) {
-<<<<<<< HEAD:drivers/spi/spidev.c
-		struct device *dev;
-
-		spidev->devt = MKDEV(SPIDEV_MAJOR, minor);
-		dev = device_create(spidev_class, &spi->dev, spidev->devt,
-				"spidev%d.%d",
-=======
-		spidev->dev.parent = &spi->dev;
-		spidev->dev.class = &spidev_class;
-		spidev->dev.devt = MKDEV(SPIDEV_MAJOR, minor);
-		dev_set_name(&spidev->dev, "spidev%d.%d",
->>>>>>> FETCH_HEAD:drivers/spi/spidev.c
-				spi->master->bus_num, spi->chip_select);
-		status = IS_ERR(dev) ? PTR_ERR(dev) : 0;
+//<<<<<<< HEAD:drivers/spi/spidev.c
+//		struct device *dev;
+//
+//		spidev->devt = MKDEV(SPIDEV_MAJOR, minor);
+//		dev = device_create(spidev_class, &spi->dev, spidev->devt,
+//				"spidev%d.%d",
+//=======
+//		spi->dev.parent = &spi->dev;
+//		spi->dev.class = &spidev_class;
+//		spi->dev.devt = MKDEV(SPIDEV_MAJOR, minor);
+//		dev_set_name(&spi->dev, "spidev%d.%d",
+//>>>>>>> FETCH_HEAD:drivers/spi/spidev.c
+//				spi->master->bus_num, spi->chip_select);
+//		status = IS_ERR(dev) ? PTR_ERR(dev) : 0;
 	} else {
 		dev_dbg(&spi->dev, "no minor number available!\n");
 		status = -ENODEV;
_