[Armadeus-commitlog] armadeus branch, master, updated. release-3.4-204-g1b903f6

[Julien B a. A. <ar...@us...>]

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 "armadeus".

The branch, master has been updated
       via  1b903f63a6065d9139b0f63992f56a568b531eca (commit)
       via  4c614e27965926e0b9dd29e6c100a00ef8bda39d (commit)
      from  104c6a0bac75724b6a1617489e679178f0d50b22 (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 1b903f63a6065d9139b0f63992f56a568b531eca
Merge: 4c614e27965926e0b9dd29e6c100a00ef8bda39d 104c6a0bac75724b6a1617489e679178f0d50b22
Author: Julien Boibessot <jul...@ar...>
Date:   Mon Jun 20 17:33:34 2011 +0200

    Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus

commit 4c614e27965926e0b9dd29e6c100a00ef8bda39d
Author: Julien Boibessot <jul...@ar...>
Date:   Mon Jun 20 17:32:55 2011 +0200

    [LINUX] Updates APF51 default Linux config

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

Summary of changes:
 .../armadeus/apf51/apf51-linux-2.6.38.config       |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.38.config b/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.38.config
index 7af45e1..5c05c37 100644
--- a/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.38.config
+++ b/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.38.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux/arm 2.6.38.1 Kernel Configuration
-# Sun Jun 19 23:11:15 2011
+# Mon Jun 20 17:28:57 2011
 #
 CONFIG_ARM=y
 CONFIG_HAVE_PWM=y
@@ -1918,6 +1918,7 @@ CONFIG_IIO=m
 # CONFIG_AD7291 is not set
 # CONFIG_AD7298 is not set
 # CONFIG_AD7314 is not set
+# CONFIG_AD7606 is not set
 # CONFIG_AD799X is not set
 # CONFIG_AD7476 is not set
 # CONFIG_AD7887 is not set


hooks/post-receive
-- 
armadeus