From mboxrd@z Thu Jan  1 00:00:00 1970
From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated.
 2e1cf5d9604b5c9b3c7995f460245583eff809ea
Date: Fri, 05 Jul 2013 15:18:53 +0200
Message-ID: <20130705131853.5A2BD201D3@argus.ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7768962486646680672=="
List-Id: <ipfire-scm.lists.ipfire.org>

--===============7768962486646680672==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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, next has been updated
       via  2e1cf5d9604b5c9b3c7995f460245583eff809ea (commit)
       via  c59eaea9ea398cb190fff2bebe24b37dfc4349cb (commit)
      from  c5e5324cb6a121f13657df56f22da67e0d465ffa (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 2e1cf5d9604b5c9b3c7995f460245583eff809ea
Merge: c5e5324 c59eaea
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Fri Jul 5 15:18:37 2013 +0200

    Merge branch 'master' into next

-----------------------------------------------------------------------

Summary of changes:
 config/kernel/kernel.config.armv5tel-ipfire-omap | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

Difference in files:
diff --git a/config/kernel/kernel.config.armv5tel-ipfire-omap b/config/kernel=
/kernel.config.armv5tel-ipfire-omap
index f49ae21..e2adae7 100644
--- a/config/kernel/kernel.config.armv5tel-ipfire-omap
+++ b/config/kernel/kernel.config.armv5tel-ipfire-omap
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.2.47 Kernel Configuration
+# Linux/arm 3.2.48-ipfire-omap Kernel Configuration
 #
 CONFIG_ARM=3Dy
 CONFIG_HAVE_PWM=3Dy
@@ -1546,7 +1546,11 @@ CONFIG_HOSTAP_FIRMWARE=3Dy
 # CONFIG_RT2X00 is not set
 # CONFIG_RTL8192CU is not set
 # CONFIG_WL1251 is not set
-# CONFIG_WL12XX_MENU is not set
+CONFIG_WL12XX_MENU=3Dm
+CONFIG_WL12XX=3Dm
+CONFIG_WL12XX_SDIO=3Dm
+# CONFIG_WL12XX_SDIO_TEST is not set
+CONFIG_WL12XX_PLATFORM_DATA=3Dy
 # CONFIG_ZD1211RW is not set
 # CONFIG_MWIFIEX is not set
=20
@@ -2761,7 +2765,6 @@ CONFIG_USB_STORAGE_ONETOUCH=3Dm
 CONFIG_USB_STORAGE_KARMA=3Dm
 CONFIG_USB_STORAGE_CYPRESS_ATACB=3Dm
 CONFIG_USB_STORAGE_ENE_UB6250=3Dm
-CONFIG_USB_UAS=3Dm
 # CONFIG_USB_LIBUSUAL is not set
=20
 #


hooks/post-receive
--
IPFire 2.x development tree

--===============7768962486646680672==--