propagate from branch 'org.openembedded.dev' (head 968e6781dca5ee420f8b36434c88d54caf...

            to branch 'org.openembedded.dev.avr32' (head facce641a6e2c90f8a2171880eafb72136895681)

diff --cc conf/distro/angstrom-2008.1.conf
Simple merge

diff --cc packages/linux/linux_2.6.23.bb
index aaa9e22,0b276b4..5e5d507
--- 1/packages/linux/linux_2.6.23.bb
--- 2/packages/linux/linux_2.6.23.bb
+++ b/packages/linux/linux_2.6.23.bb
@@@ -16,13 -17,10 +17,17 @@@ SRC_URI = "${KERNELORG_MIRROR}/pub/linu
             file://defconfig \
           "
  
 +# Bug fixes on the 2.6.23.x stable branch
 +SRC_URI += "http://www.kernel.org/pub/linux/kernel/v2.6/patch-2.6.23.12.bz2;patch=1"
 +# Add support for squashfs-lzma (a highly compressed read-only filesystem)
 +SRC_URI += "http://kamikaze.waninkoko.info/patches/2.6.23/klight1/broken-out/squashfs-lzma-2.6.23.patch;patch=1"
 +# Completely fair scheduler
 +SRC_URI += "http://people.redhat.com/mingo/cfs-scheduler/sched-cfs-v2.6.23.12-v24.1.patch;patch=1"
 +
+ SRC_URI_append_avr32 = " \
+                        http://avr32linux.org/twiki/pub/Main/LinuxPatches/linux-2.6.23.atmel.3.patch.bz2;patch=1 \
+                        "
+ 
  SRC_URI_append_cm-x270 = "\
        file://0001-cm-x270-base2.patch;patch=1 \
        file://0002-cm-x270-match-type.patch;patch=1 \

diff --cc packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
index 4367e40,83ef9ea..71d0ecc
--- 1/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
--- 2/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
+++ b/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
@@@ -29,9 -29,10 +29,13 @@@ SRC_URI = "${XORG_MIRROR}/individual/xs
          file://03-xglamo-no-vesa.patch;patch=1 \
  "
  
+ SRC_URI_append_avr32 = " \
+         file://xorg-avr32-support.diff;patch=1 \
+ "
+ 
 +SRC_URI_append_tosa = "file://tosa-fbdev.patch;patch=1"
 +PACKAGE_ARCH_xserver-kdrive-fbdev_tosa = "${MACHINE_ARCH}"
 +
  S = "${WORKDIR}/xorg-server-${PV}"
  
  W100_OECONF = "--disable-w100"