Merge branch 'org.openembedded.dev' of git://git.openembedded.org/openembedded into...

diff --combined conf/checksums.ini
index 660aa5a,f4255ee..26c217a
--- 1/conf/checksums.ini
--- 2/conf/checksums.ini
+++ b/conf/checksums.ini
@@@ -8606,6 -8606,10 +8606,10 @@@ sha256=f215b31c55da6f6111ab473565689eb3
  md5=c1eb3de26b67ddc08a61a7c2fc636203
  sha256=36480bce862b6d424f4b34bbfeed838b80bcbb484602dee43c412a7d0dc4b42b
  
+ [ftp://ftp.gnu.org/gnu/gnuradio/gnuradio-3.2.1.tar.gz]
+ md5=f0721c5dce7cb02c75ac4e7bb9cc0ec9
+ sha256=a12b0fcd08508a85ee7ec7003ec0f3418378d479304ce85e8453d46bacc0ce9f
+ 
  [ftp://ftp.gnu.org/gnu/gnuradio/gnuradio-3.2.tar.gz]
  md5=9d91d0f8f2cb35bc86435784fa8e72d8
  sha256=a780490056b1f1f95c7bf91e175773e00f4be23e1b7e5147ccd507b6f32097af
@@@ -18910,10 -18914,6 +18914,10 @@@ sha256=b6bbb0dea427aa733c37d58a94b819b5
  md5=b0aac48e4528aa1fa2b6759f53508643
  sha256=6ae71591d0184debcafb134896577447574c8b29545af6e99f6ff09dc3448571
  
 +[http://kernel.org/pub/linux/kernel/v2.6/testing/v2.6.25/patch-2.6.25-rc4.bz2]
 +md5=a4cc0fd5bda60e498246b6d69c873895
 +sha256=781656a17fe24b018ab2c33c2481c2a07e9abfa9c6203995e2fbf7c852adda3a
 +
  [http://kernel.org/pub/linux/kernel/v2.6/patch-2.6.25.20.bz2]
  md5=9d870b9947ce0618cf18445e4be33e15
  sha256=c4d69706880f274b84c8f5ef36ce955b3173e6ea3c083f724c0371096b27e738