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 3.x development tree".

The branch, master has been updated via b1839f5421d06660cc701e803d7c85eb7eab51ad (commit) via f256b495b542fe2f7a14e5bc7d8c10d26266091a (commit) from 159cd7910bda2d7cdb0d8f48c203f012c9dbad1a (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 b1839f5421d06660cc701e803d7c85eb7eab51ad Merge: f256b49 159cd79 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Mar 25 20:47:23 2011 +0100

Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x

commit f256b495b542fe2f7a14e5bc7d8c10d26266091a Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Mar 25 20:46:44 2011 +0100

kernel: Build in autofs (was module).

References #149.

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

Summary of changes: pkgs/kernel/config | 4 ++-- pkgs/kernel/kernel.nm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)

Difference in files: diff --git a/pkgs/kernel/config b/pkgs/kernel/config index 45d860d..723bdff 100644 --- a/pkgs/kernel/config +++ b/pkgs/kernel/config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux/i386 2.6.37.2 Kernel Configuration -# Tue Mar 22 11:50:10 2011 +# Fri Mar 25 19:45:23 2011 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -3677,7 +3677,7 @@ CONFIG_FANOTIFY=y # CONFIG_QUOTA is not set CONFIG_QUOTA_NETLINK_INTERFACE=y CONFIG_QUOTACTL=y -CONFIG_AUTOFS4_FS=m +CONFIG_AUTOFS4_FS=y CONFIG_FUSE_FS=m CONFIG_CUSE=m CONFIG_GENERIC_ACL=y diff --git a/pkgs/kernel/kernel.nm b/pkgs/kernel/kernel.nm index 3144ecb..4eb3c56 100644 --- a/pkgs/kernel/kernel.nm +++ b/pkgs/kernel/kernel.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include

PKG_NAME = linux PKG_VER = 2.6.37.2 -PKG_REL = 3 +PKG_REL = 4

PKG_MAINTAINER = Michael Tremer michael.tremer@ipfire.org PKG_GROUPS = System/Kernels

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