From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 20 Jun 2013 09:02:27 +0000 (+0200)
Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e8c070037f574d10cca8e66b2d8f1b0bbcfdd30d;hp=f4c3f51441bc9420a645f23ae5f53c651ff53ee9;p=people%2Fteissler%2Fipfire-2.x.git

Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
---

diff --git a/config/rootfiles/core/70/filelists/armv5tel/linux-kirkwood b/config/rootfiles/core/70/filelists/armv5tel/linux-kirkwood
new file mode 120000
index 000000000..72171071e
--- /dev/null
+++ b/config/rootfiles/core/70/filelists/armv5tel/linux-kirkwood
@@ -0,0 +1 @@
+../../../../common/armv5tel/linux-kirkwood
\ No newline at end of file
diff --git a/config/rootfiles/core/70/filelists/armv5tel/linux-omap b/config/rootfiles/core/70/filelists/armv5tel/linux-omap
new file mode 120000
index 000000000..50bf78651
--- /dev/null
+++ b/config/rootfiles/core/70/filelists/armv5tel/linux-omap
@@ -0,0 +1 @@
+../../../../common/armv5tel/linux-omap
\ No newline at end of file
diff --git a/config/rootfiles/core/70/filelists/armv5tel/linux-rpi b/config/rootfiles/core/70/filelists/armv5tel/linux-rpi
new file mode 120000
index 000000000..a651a498f
--- /dev/null
+++ b/config/rootfiles/core/70/filelists/armv5tel/linux-rpi
@@ -0,0 +1 @@
+../../../../common/armv5tel/linux-rpi
\ No newline at end of file
diff --git a/config/rootfiles/core/70/filelists/i586/grub.conf b/config/rootfiles/core/70/filelists/i586/grub.conf
new file mode 100644
index 000000000..b120cc565
--- /dev/null
+++ b/config/rootfiles/core/70/filelists/i586/grub.conf
@@ -0,0 +1 @@
+boot/grub/grub.conf
diff --git a/config/rootfiles/core/70/filelists/i586/linux b/config/rootfiles/core/70/filelists/i586/linux
new file mode 120000
index 000000000..693ec4bbf
--- /dev/null
+++ b/config/rootfiles/core/70/filelists/i586/linux
@@ -0,0 +1 @@
+../../../../common/i586/linux
\ No newline at end of file