merge of 'dee683d3de0616c362d03b01a6bf3caa2da5423c'

     and 'ee048875cfe4eb10e9fae21dc07aaa545d4f29fc'

diff --cc packages/linux/linux_2.6.24.bb
index 1fddb12434069b4dcdf34460201c54daafc167fa,d9f8063a8eb0f43f60c3f6021332e78d33de2ba8..a45db10f1cbb29de501095c69fbc49e0b7f2cf31
--- 1/packages/linux/linux_2.6.24.bb
--- 2/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.