diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2009-12-15 14:46:11 +0100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2009-12-15 14:46:11 +0100 |
commit | 58884fc059504abafc9126613a7049464ba701e7 (patch) | |
tree | 61030608675a792923aff657516c48a6a2048693 /recipes/linux/linux_2.6.23+2.6.24-rc6.bb | |
parent | 75820363234db9d6335997658c6f606654d1588c (diff) | |
parent | 47d6cb217ff161738488f4f82af9dd8f8c616ce0 (diff) | |
download | openembedded-58884fc059504abafc9126613a7049464ba701e7.tar.gz |
Merge commit 'origin/org.openembedded.dev' into martin_jansa/xorg-7.5
Conflicts:
conf/distro/include/angstrom-2008-preferred-versions.inc
Diffstat (limited to 'recipes/linux/linux_2.6.23+2.6.24-rc6.bb')
-rw-r--r-- | recipes/linux/linux_2.6.23+2.6.24-rc6.bb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/recipes/linux/linux_2.6.23+2.6.24-rc6.bb b/recipes/linux/linux_2.6.23+2.6.24-rc6.bb index 73100b62c3..035e6054f6 100644 --- a/recipes/linux/linux_2.6.23+2.6.24-rc6.bb +++ b/recipes/linux/linux_2.6.23+2.6.24-rc6.bb @@ -6,7 +6,7 @@ DEFAULT_PREFERENCE = "-1" PR = "r0" 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-rc6.bz2;patch=1 \ + ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/v2.6.24/patch-2.6.24-rc6.bz2;patch=1 \ file://defconfig \ " |