merge of 'ac1039a1d9d91d76eddb2acaf45a698b02653e22'

     and 'b6bd29a92b1bcc039254466a0ec064dc61ea94dc'

diff --cc packages/linux/linux_2.6.23+2.6.24-rc5.bb
index 6c3f855df91bc27d1934a741fc789de3a54475bb,44dbbc0786568fd0a756e4f03e123c6a8a6e08a7..a7e9b64887aaaa2d0fc0d16ae982b82b2b272a5d
--- 1/packages/linux/linux_2.6.23+2.6.24-rc5.bb
--- 2/packages/linux/linux_2.6.23+2.6.24-rc5.bb
+++ b/packages/linux/linux_2.6.23+2.6.24-rc5.bb
@@@ -2,8 -2,9 +2,9 @@@ require linux.in
  
  # Mark archs/machines that this kernel supports
  DEFAULT_PREFERENCE = "-1"
+ DEFAULT_PREFERENCE_alix = "1"
  
 -PR = "r0"
 +PR = "r2"
  
  SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.23.tar.bz2 \
           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/patch-2.6.24-rc5.bz2;patch=1 \