From owner-svn-src-all@FreeBSD.ORG  Sat May 10 08:07:41 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id C4C7ADE8;
 Sat, 10 May 2014 08:07:41 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id B177B16A;
 Sat, 10 May 2014 08:07:41 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4A87fSF082387;
 Sat, 10 May 2014 08:07:41 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4A87fHV082386;
 Sat, 10 May 2014 08:07:41 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <201405100807.s4A87fHV082386@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Sat, 10 May 2014 08:07:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r265809 - stable/10/sys/boot/fdt/dts
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 10 May 2014 08:07:41 -0000

Author: rpaulo
Date: Sat May 10 08:07:41 2014
New Revision: 265809
URL: http://svnweb.freebsd.org/changeset/base/265809

Log:
  Manually MFC 262714:
    Add a missing semicolong, noticed by the gnu dt compiler.
  
  In head, the directory layout changed and we can't svn merge correctly.

Modified:
  stable/10/sys/boot/fdt/dts/beaglebone.dts

Modified: stable/10/sys/boot/fdt/dts/beaglebone.dts
==============================================================================
--- stable/10/sys/boot/fdt/dts/beaglebone.dts	Sat May 10 07:56:01 2014	(r265808)
+++ stable/10/sys/boot/fdt/dts/beaglebone.dts	Sat May 10 08:07:41 2014	(r265809)
@@ -135,7 +135,7 @@
 				compatible = "ti,am335x-pmic";
 				reg = <0x24>;
 			};
-		}
+		};
 	};
 
 	chosen {