PERFORCE change 180223 for review

[John Baldwin]

http://p4web.freebsd.org/@@180223?ac=10

Change 180223 by jhb at jhb_jhbbsd on 2010/06/25 20:29:17

	Fix merge-o.

Affected files ...

.. //depot/projects/smpng/sys/arm/include/bootinfo.h#3 edit

Differences ...

==== //depot/projects/smpng/sys/arm/include/bootinfo.h#3 (text+ko) ====

@@ -22,7 +22,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/arm/include/bootinfo.h,v 1.1 2008/10/14 10:11:14 raj Exp $
+ * $FreeBSD: src/sys/arm/include/bootinfo.h,v 1.3 2010/06/14 16:05:21 raj Exp $
  */
 
 #ifndef _MACHINE_BOOTINFO_H_