Merge lp:~dannf/ubuntu/trusty/flash-kernel/m400 into lp:ubuntu/trusty/flash-kernel

[dann frazier]

[lp:~dannf/ubuntu/trusty/flash-kernel/m400]

468. By dann frazier on 2014-03-04

add lp bug reference

[Martin Pitt (pitti)]

Sponsored, thanks!

review: Approve

=== modified file 'db/all.db'
--- db/all.db	2013-12-23 14:51:32 +0000
+++ db/all.db	2014-03-04 20:55:40 +0000
@@ -132,6 +132,16 @@
 Required-packages: u-boot-tools
 Bootloader-sets-root: yes
 
+Machine: HP ProLiant m400 Server Cartridge
+U-Boot-Kernel-Address: 0x80000
+U-Boot-Initrd-Address: 0x0
+U-Boot-Script-Address: 0x4004000000
+U-Boot-Script-Name: bootscr.xgene
+Required-Packages: u-boot-tools
+Boot-Kernel-Path: /boot/uImage
+Boot-Initrd-Path: /boot/uInitrd
+Boot-Script-Path: /boot/boot.scr
+
 Machine: HP t5325 Thin Client
 Kernel-Flavors: kirkwood
 Machine-Id: 2846
 
=== modified file 'debian/changelog'
--- debian/changelog	2013-12-23 14:51:32 +0000
+++ debian/changelog	2014-03-04 20:55:40 +0000
@@ -1,3 +1,9 @@
+flash-kernel (3.0~rc.4ubuntu47) UNRELEASED; urgency=medium
+
+  * Add support for HP ProLiant m400 Server Cartridges (LP: #1287910)
+
+ -- dann frazier <[e-mail]>  Tue, 25 Feb 2014 19:51:48 -0700
+
 flash-kernel (3.0~rc.4ubuntu46) trusty; urgency=low
 
   * Add support for APM X-Gene