Merge lp:~dannf/base-installer/use-generic-instead-of-highbank into lp:~ubuntu-core-dev/base-installer/ubuntu

[dann frazier]

=== modified file 'debian/changelog'
--- debian/changelog	2012-11-16 16:02:58 +0000
+++ debian/changelog	2013-04-09 06:08:19 +0000
@@ -1,3 +1,9 @@
+base-installer (1.122ubuntu15) UNRELEASED; urgency=low
+
+  * Replace "highbank" flavor with "generic" (LP: #1166597)
+
+ -- dann frazier <[e-mail]>  Tue, 09 Apr 2013 00:01:08 -0600
+
 base-installer (1.122ubuntu14) raring; urgency=low
 
   [ Ben Collins ]

=== modified file 'kernel/armel.sh'
--- kernel/armel.sh	2012-05-16 15:25:48 +0000
+++ kernel/armel.sh	2013-04-09 06:08:19 +0000
@@ -1,6 +1,6 @@
 arch_get_kernel_flavour () {
 	case "$SUBARCH" in
-	    armadaxp|dove|highbank|imx51|omap|omap4|iop32x|iop33x|ixp4xx|kirkwood|orion5x|versatile|mx5)
+	    armadaxp|dove|generic|imx51|omap|omap4|iop32x|iop33x|ixp4xx|kirkwood|orion5x|versatile|mx5)
 		echo "$SUBARCH"
 		return 0 ;;
 	    ads)