From: Koen Kooi <koen@openembedded.org>
Date: Sat, 1 Mar 2008 08:52:11 +0000 (+0000)
Subject: merge of 'dee683d3de0616c362d03b01a6bf3caa2da5423c'
X-Git-Tag: Release-2010-05/1~7572^2~25
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5001a8e2e32fb491f8c0fb2acb0c085636c4ee32;p=openembedded.git

Merge ... 'dee683d3de0616c362d03b01a6bf3caa2da5423c'
     and 'ee048875cfe4eb10e9fae21dc07aaa545d4f29fc'
---

5001a8e2e32fb491f8c0fb2acb0c085636c4ee32
diff --cc packages/linux/linux_2.6.24.bb
index 1fddb12434,d9f8063a8e..a45db10f1c
--- a/packages/linux/linux_2.6.24.bb
+++ b/packages/linux/linux_2.6.24.bb
@@@ -7,13 -8,9 +8,13 @@@ DEFAULT_PREFERENCE_mpc8313e-rdb = "1
  
  DEPENDS_append_mpc8313e-rdb = " dtc-native"
  
- PR = "r6"
+ PR = "r7"
  
  SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2 \
 +           http://kamikaze.waninkoko.info/patches/2.6.24/kamikaze1/broken-out/squashfs-lzma-2.6.24.patch;patch=1 \
 +           file://powerpc-clockres.patch;patch=1 \
 +           file://leds-cpu-activity.patch;patch=1 \
 +           file://leds-cpu-activity-powerpc.patch;patch=1 \
             file://defconfig"
  
  # Real-time preemption. This is experimental and requires a different defconfig.