diff options
| author |   Klaus Kurzmann <mok@fluxnetz.de> | 2009-12-15 14:46:02 +0100 |
|---|---|---|
| committer | Klaus Kurzmann <mok@fluxnetz.de> | 2009-12-15 14:46:02 +0100 |
| commit | 54fa869952dc6b7c2f05018f65434877257d44de (patch) | |
| tree | 061bbe8844bd42f826a53ce1b4414dc6a568d86c /recipes/linux/linux_2.6.21+2.6.22-rc1.bb | |
| parent | b9f0d895f3d94ff42a8cd5c02924443915ce0181 (diff) | |
| parent | 47d6cb217ff161738488f4f82af9dd8f8c616ce0 (diff) | |
| download | openembedded-54fa869952dc6b7c2f05018f65434877257d44de.tar.gz | |
Merge branch 'org.openembedded.dev' into martin_jansa/srcpv
Conflicts:
recipes/mesa/mesa-xlib_7.2.bb
recipes/uclibc/uclibc_nptl.bb
re-add SRCPV to illume-keyboards-shr
Signed-off-by: Klaus Kurzmann <mok@fluxnetz.de>
Diffstat (limited to 'recipes/linux/linux_2.6.21+2.6.22-rc1.bb')
| -rw-r--r-- | recipes/linux/linux_2.6.21+2.6.22-rc1.bb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/recipes/linux/linux_2.6.21+2.6.22-rc1.bb b/recipes/linux/linux_2.6.21+2.6.22-rc1.bb index 35b2efe74a..563820fec7 100644 --- a/recipes/linux/linux_2.6.21+2.6.22-rc1.bb +++ b/recipes/linux/linux_2.6.21+2.6.22-rc1.bb @@ -9,7 +9,7 @@ KERNEL_RELEASE = "2.6.22-rc1" PR = "r2" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.21.tar.bz2 \ - ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/patch-2.6.22-rc1.bz2;patch=1 \ + ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/v2.6.22/patch-2.6.22-rc1.bz2;patch=1 \ file://defconfig \ " |