[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.0-26-gb092fc2

[jorasse <jo...@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  b092fc2509114028405cf860bcf3738725083e5e (commit)
       via  7ffbed6bd0b4e26848af5708dc824b9c9feb1637 (commit)
      from  34865f3932d2ec985e5f66e91717221dc655f2db (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 b092fc2509114028405cf860bcf3738725083e5e
Merge: 7ffbed6 34865f3
Author: Eric Jarrige <eri...@ar...>
Date:   Wed Sep 19 16:05:27 2012 +0200

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

commit 7ffbed6bd0b4e26848af5708dc824b9c9feb1637
Author: Eric Jarrige <eri...@ar...>
Date:   Wed Sep 19 16:04:14 2012 +0200

    [linux] apf27 default config for kernel 2.6.29

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

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

diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.29.config b/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.29.config
index 0394033..983338f 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.29.config
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.29.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.29.6
-# Wed Jun 13 13:46:15 2012
+# Wed Sep 19 15:58:55 2012
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1470,6 +1470,7 @@ CONFIG_ARMADEUS_FPGA_LOADER_DRIVER=m
 # Handheld related
 #
 CONFIG_ARMADEUS_PWM_DRIVER=m
+# CONFIG_ARMADEUS_MXS_PWM_DRIVER is not set
 CONFIG_IMX_BACKLIGHT=m
 # CONFIG_HX5116_DISPLAY is not set
 


hooks/post-receive
-- 
armadeus