[Armadeus-commitlog] armadeus branch, master, updated. release-3.4-285-g3fbbd69

[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  3fbbd6973ad5410d481682e5561fb10f2dc34b0c (commit)
       via  7bd0735b6204105ba03f429adb2a207db9d06e5e (commit)
      from  bf0ff1bfdb1a2349d2f16744394cd1fd94baca78 (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 3fbbd6973ad5410d481682e5561fb10f2dc34b0c
Merge: 7bd0735b6204105ba03f429adb2a207db9d06e5e bf0ff1bfdb1a2349d2f16744394cd1fd94baca78
Author: jorasse <jo...@ar...>
Date:   Sun Jul 3 20:40:06 2011 +0200

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

commit 7bd0735b6204105ba03f429adb2a207db9d06e5e
Author: jorasse <jo...@ar...>
Date:   Sun Jul 3 20:39:46 2011 +0200

    [LINUX] add Armadeus Project in the list of copyrights

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

Summary of changes:
 .../2.6.38/281-apf27-armadeus-add_apf27.c.patch    |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/281-apf27-armadeus-add_apf27.c.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/281-apf27-armadeus-add_apf27.c.patch
index 4ce66b7..2031c77 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/281-apf27-armadeus-add_apf27.c.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/281-apf27-armadeus-add_apf27.c.patch
@@ -13,11 +13,12 @@ Index: linux-2.6.38.1/arch/arm/mach-imx/apf27.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
 +++ linux-2.6.38.1/arch/arm/mach-imx/apf27.c	2011-06-03 17:42:03.000000000 +0200
-@@ -0,0 +1,614 @@
+@@ -0,0 +1,615 @@
 + /*
 + * Support for the APF27 System On Module
 + *
 + * Copyright (C) 2008-2011 ARMadeus Systems <su...@ar...>
++ * Copyright (C) 2008-2010 Armadeus Project
 + *
 + * Based on code which is:
 + * Copyright 2007 Robert Schwebel <r.s...@pe...>, Pengutronix


hooks/post-receive
-- 
armadeus