diff options
author | Sebastian Spaeth <Sebastian@SSpaeth.de> | 2009-12-17 13:47:50 +0100 |
---|---|---|
committer | Sebastian Spaeth <Sebastian@SSpaeth.de> | 2009-12-17 13:47:50 +0100 |
commit | f45580a1527dccdda100eee7f25f9f2c41af4db8 (patch) | |
tree | 2218d4955f368e1804d86f212cc78317b4327f77 /recipes/linux/linux_2.6.22+2.6.23-rc3.bb | |
parent | 887b437869709625f5323438808ded9990cf590a (diff) | |
parent | e3df24d64a48aff19aa9960dd9308a071b243b09 (diff) | |
download | openembedded-f45580a1527dccdda100eee7f25f9f2c41af4db8.tar.gz |
Merge commit 'origin/shr/merge' into shr/testing2009
Conflicts:
conf/distro/include/sane-srcrevs.inc
recipes/enotes/enotes_svn.bb
recipes/intone-video/intone-video_svn.bb
recipes/intone/intone_svn.bb
recipes/shr/shr-wizard_git.bb
recipes/tasks/task-shr-minimal.bb
Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
Diffstat (limited to 'recipes/linux/linux_2.6.22+2.6.23-rc3.bb')
-rw-r--r-- | recipes/linux/linux_2.6.22+2.6.23-rc3.bb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/recipes/linux/linux_2.6.22+2.6.23-rc3.bb b/recipes/linux/linux_2.6.22+2.6.23-rc3.bb index 47c3564087..e52800a8f4 100644 --- a/recipes/linux/linux_2.6.22+2.6.23-rc3.bb +++ b/recipes/linux/linux_2.6.22+2.6.23-rc3.bb @@ -10,7 +10,7 @@ KERNEL_RELEASE = "2.6.23-rc3" PR = "r1" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${BASE_KERNEL_VERSION}.tar.bz2 \ - ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/patch-${KERNEL_VERSION}.bz2;patch=1 \ + ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/v2.6.23/patch-${KERNEL_VERSION}.bz2;patch=1 \ file://defconfig \ " |