Merge branch 'sid' of git+ssh://git.debian.org/git/kernel/linux into sid

7 years ago · 0e3efec1d5
parent 43640872d9 f09015b138
commit 0e3efec1d5
2 changed files with 2 additions and 0 deletions
--- a/debian/installer/mipsel/kernel-versions
+++ b/debian/installer/mipsel/kernel-versions
@ -3,3 +3,4 @@ mipsel -       4kc-malta     -             y      -
 mipsel -       loongson-2e   -             y      -
 mipsel -       loongson-2f   -             y      -
 mipsel -       loongson-3    -             y      -
+mipsel -       octeon        -             y      -
--- a/debian/installer/mipsel/modules/mipsel-octeon
+++ b/debian/installer/mipsel/modules/mipsel-octeon
@ -0,0 +1 @@
+../../mips/modules/mips-octeon