[Merge] lp:~manjo/ubuntu/utopic/libdebian-installer/HP-m800 into lp:ubuntu/libdebian-installer

[dann frazier]

Review: Needs Fixing

Fix whitespace

Diff comments:

> === modified file 'debian/changelog'
> --- debian/changelog	2014-03-20 13:49:45 +0000
> +++ debian/changelog	2014-06-19 20:34:39 +0000
> @@ -1,3 +1,9 @@
> +libdebian-installer (0.88ubuntu5) trusty; urgency=medium
> +
> +  * Added support for HP ProLiant m800 Server Cartridge (keystone)
> +
> + -- Manoj Iyer <manoj.iyer at canonical.com>  Thu, 19 Jun 2014 15:31:07 -0500
> +
>  libdebian-installer (0.88ubuntu4) trusty; urgency=medium
>  
>    * Report the Calxeda ECX-2000 as generic-lpae, not generic, to match
> 
> === modified file 'src/system/subarch-arm-linux.c'
> --- src/system/subarch-arm-linux.c	2014-03-20 13:49:45 +0000
> +++ src/system/subarch-arm-linux.c	2014-06-19 20:34:39 +0000
> @@ -38,6 +38,7 @@
>      { "Marvell DB-MV88F6781-BP Development Board", "dove" }, /* Marvell Dove SoC */
>      { "ADS" , "ads" }, /* Matches only ADS boards. Put any exceptions before. */
>      { "Applied Data Systems" , "ads" }, /* More ADS boards. */
> +	{ "HP ProLiant m800 Server Cartridge", "keystone" },

Your whitespace usage is inconsistent with the existing code.

>      { "HP t5325 Thin Client", "kirkwood" },
>      { "Marvell DB-88F6281-BP Development Board", "kirkwood" },
>      { "Marvell RD-88F6192-NAS Development Board", "kirkwood" },
> 


-- 
https://code.launchpad.net/~manjo/ubuntu/utopic/libdebian-installer/HP-m800/+merge/223820
Your team Ubuntu branches is requested to review the proposed merge of lp:~manjo/ubuntu/utopic/libdebian-installer/HP-m800 into lp:ubuntu/libdebian-installer.