Merge branch 'for-sha-collateral' of git://git.pengutronix.de/git/mkl/barebox

arch/arm/mach-omap/omap3_clock_core.S

@@ -12,7 +12,7 @@
  * configurations while running in SDRAM/Flash. This provides
  * relocation and execution capability for the same.
  *
- * Orignally from http://linux.omap.com/pub/bootloader/3430sdp/barebox-v1.tar.gz
+ * Orignally from http://linux.omap.com/pub/bootloader/3430sdp/u-boot-v1.tar.gz
  */
 /*
  * (C) Copyright 2006-2008

board/freescale-mx35-3-stack/3stack.c

@@ -19,7 +19,7 @@
  *
  * Derived from:
  *
- * * mx35_3stack.c - board file for barebox-v1
+ * * mx35_3stack.c - board file for uboot-v1
  *   Copyright (C) 2007, Guennadi Liakhovetski <lg@denx.de>
  *   (C) Copyright 2008-2009 Freescale Semiconductor, Inc.
  *

drivers/nor/Kconfig

@@ -14,7 +14,7 @@ config DRIVER_CFI_NEW
 	default y
 	bool "new cfi flash driver"
 	help
-	  The old cfi flash driver is mainly an adopted version from barebox v1
+	  The old cfi flash driver is mainly an adopted version from U-Boot v1
 	  whereas the new driver contains some more experimental features such
 	  as selecting the supported chiptypes and bus widths making the driver
 	  smaller.

drivers/serial/serial_ns16550.c

@@ -63,7 +63,7 @@ static unsigned int ns16550_calc_divisor(struct console_device *cdev,
 	    cdev->dev->platform_data;
 	unsigned int clk = plat->clock;
 #ifdef CONFIG_DRIVER_SERIAL_NS16550_OMAP_EXTENSIONS
-	/* FIXME: Legacy Code copied from barebox V1 implementation
+	/* FIXME: Legacy Code copied from U-Boot V1 implementation
 	 */
 #ifdef CONFIG_ARCH_OMAP1510
 	unsigned long base = cdev->dev->map_base;