propagate from branch 'org.openembedded.dev' (head 85dec2124d884510a593355cc3c8e6072d...

            to branch 'org.openembedded.dev.avr32' (head 3bb11549cc2f7740a5512dd35c3e391d67893868)

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

diff --cc packages/linux/linux_2.6.23.bb
index 8a0a604,5584b8a..225c707
--- 1/packages/linux/linux_2.6.23.bb
--- 2/packages/linux/linux_2.6.23.bb
+++ b/packages/linux/linux_2.6.23.bb
@@@ -5,9 -5,8 +5,9 @@@ DEFAULT_PREFERENCE = "-1
  DEFAULT_PREFERENCE_cm-x270 = "1"
  DEFAULT_PREFERENCE_mpc8313e-rdb = "1"
  DEFAULT_PREFERENCE_mpc8323e-rdb = "1"
 +DEFAULT_PREFERENCE_avr32 = "1"
  
- PR = "r2"
+ PR = "r3"
  
  SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.23.tar.bz2 \
           file://binutils-buildid-arm.patch;patch=1 \