From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 08b3b6edc32469f3a3327cbb9060ed60c6f5b914
Date: Thu, 01 May 2014 11:31:08 +0200 [thread overview]
Message-ID: <20140501093108.4FE9C21003@argus.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 8991 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, master has been updated
via 08b3b6edc32469f3a3327cbb9060ed60c6f5b914 (commit)
via 9332050e3703879af21db07f1afebea515bf93b1 (commit)
from abe7ef8936adf7d3eb6ca232b25743200b096d2e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 08b3b6edc32469f3a3327cbb9060ed60c6f5b914
Merge: 9332050 abe7ef8
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu May 1 11:30:48 2014 +0200
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x
commit 9332050e3703879af21db07f1afebea515bf93b1
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu May 1 11:30:07 2014 +0200
kernel: rootfile update.
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/common/i586/linux | 18 +++++++++++++++---
config/rootfiles/packages/linux-pae | 17 ++++++++++++++---
2 files changed, 29 insertions(+), 6 deletions(-)
Difference in files:
diff --git a/config/rootfiles/common/i586/linux b/config/rootfiles/common/i586/linux
index daaa176..25eccdf 100644
--- a/config/rootfiles/common/i586/linux
+++ b/config/rootfiles/common/i586/linux
@@ -1299,9 +1299,6 @@ lib/modules/KVER-ipfire
#lib/modules/KVER-ipfire/kernel/drivers/misc/ics932s401.ko
#lib/modules/KVER-ipfire/kernel/drivers/misc/lis3lv02d
#lib/modules/KVER-ipfire/kernel/drivers/misc/lis3lv02d/lis3lv02d.ko
-#lib/modules/KVER-ipfire/kernel/drivers/misc/mei
-#lib/modules/KVER-ipfire/kernel/drivers/misc/mei/mei-me.ko
-#lib/modules/KVER-ipfire/kernel/drivers/misc/mei/mei.ko
#lib/modules/KVER-ipfire/kernel/drivers/misc/pch_phub.ko
#lib/modules/KVER-ipfire/kernel/drivers/misc/ti-st
#lib/modules/KVER-ipfire/kernel/drivers/misc/ti-st/st_drv.ko
@@ -2191,12 +2188,17 @@ lib/modules/KVER-ipfire
#lib/modules/KVER-ipfire/kernel/drivers/w1/slaves/w1_therm.ko
#lib/modules/KVER-ipfire/kernel/drivers/w1/wire.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog
+#lib/modules/KVER-ipfire/kernel/drivers/watchdog/acquirewdt.ko
+#lib/modules/KVER-ipfire/kernel/drivers/watchdog/advantechwdt.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/alim1535_wdt.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/alim7101_wdt.ko
+#lib/modules/KVER-ipfire/kernel/drivers/watchdog/cpu5wdt.ko
+#lib/modules/KVER-ipfire/kernel/drivers/watchdog/eurotechwdt.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/f71808e_wdt.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/geodewdt.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/hpwdt.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/i6300esb.ko
+#lib/modules/KVER-ipfire/kernel/drivers/watchdog/iTCO_vendor_support.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/iTCO_wdt.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/ib700wdt.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/ibmasr.ko
@@ -2205,11 +2207,20 @@ lib/modules/KVER-ipfire
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/it87_wdt.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/machzwd.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/nv_tco.ko
+#lib/modules/KVER-ipfire/kernel/drivers/watchdog/pc87413_wdt.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/pcwd_pci.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/pcwd_usb.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/retu_wdt.ko
+#lib/modules/KVER-ipfire/kernel/drivers/watchdog/sbc60xxwdt.ko
+#lib/modules/KVER-ipfire/kernel/drivers/watchdog/sbc7240_wdt.ko
+#lib/modules/KVER-ipfire/kernel/drivers/watchdog/sbc8360.ko
+#lib/modules/KVER-ipfire/kernel/drivers/watchdog/sbc_epx_c3.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/sbc_fitpc2_wdt.ko
+#lib/modules/KVER-ipfire/kernel/drivers/watchdog/sc1200wdt.ko
+#lib/modules/KVER-ipfire/kernel/drivers/watchdog/sc520_wdt.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/sch311x_wdt.ko
+#lib/modules/KVER-ipfire/kernel/drivers/watchdog/scx200_wdt.ko
+#lib/modules/KVER-ipfire/kernel/drivers/watchdog/smsc37b787_wdt.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/softdog.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/sp5100_tco.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/via_wdt.ko
@@ -2218,6 +2229,7 @@ lib/modules/KVER-ipfire
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/w83697ug_wdt.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/w83877f_wdt.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/w83977f_wdt.ko
+#lib/modules/KVER-ipfire/kernel/drivers/watchdog/wafer5823wdt.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/wdt_pci.ko
#lib/modules/KVER-ipfire/kernel/fs
#lib/modules/KVER-ipfire/kernel/fs/btrfs
diff --git a/config/rootfiles/packages/linux-pae b/config/rootfiles/packages/linux-pae
index 242bc96..e46f855 100644
--- a/config/rootfiles/packages/linux-pae
+++ b/config/rootfiles/packages/linux-pae
@@ -1295,9 +1295,6 @@ lib/modules/KVER-ipfire-pae
#lib/modules/KVER-ipfire-pae/kernel/drivers/misc/ics932s401.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/misc/lis3lv02d
#lib/modules/KVER-ipfire-pae/kernel/drivers/misc/lis3lv02d/lis3lv02d.ko
-#lib/modules/KVER-ipfire-pae/kernel/drivers/misc/mei
-#lib/modules/KVER-ipfire-pae/kernel/drivers/misc/mei/mei-me.ko
-#lib/modules/KVER-ipfire-pae/kernel/drivers/misc/mei/mei.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/misc/pch_phub.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/misc/ti-st
#lib/modules/KVER-ipfire-pae/kernel/drivers/misc/ti-st/st_drv.ko
@@ -2192,12 +2189,17 @@ lib/modules/KVER-ipfire-pae
#lib/modules/KVER-ipfire-pae/kernel/drivers/w1/slaves/w1_therm.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/w1/wire.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog
+#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/acquirewdt.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/advantechwdt.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/alim1535_wdt.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/alim7101_wdt.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/cpu5wdt.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/eurotechwdt.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/f71808e_wdt.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/geodewdt.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/hpwdt.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/i6300esb.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/iTCO_vendor_support.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/iTCO_wdt.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/ib700wdt.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/ibmasr.ko
@@ -2206,11 +2208,19 @@ lib/modules/KVER-ipfire-pae
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/it87_wdt.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/machzwd.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/nv_tco.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/pc87413_wdt.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/pcwd_pci.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/pcwd_usb.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/retu_wdt.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/sbc60xxwdt.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/sbc7240_wdt.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/sbc8360.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/sbc_epx_c3.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/sbc_fitpc2_wdt.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/sc1200wdt.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/sc520_wdt.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/sch311x_wdt.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/smsc37b787_wdt.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/softdog.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/sp5100_tco.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/via_wdt.ko
@@ -2219,6 +2229,7 @@ lib/modules/KVER-ipfire-pae
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/w83697ug_wdt.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/w83877f_wdt.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/w83977f_wdt.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/wafer5823wdt.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/wdt_pci.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/xen_wdt.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/xen
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2014-05-01 9:31 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140501093108.4FE9C21003@argus.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox