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

4 files changed, 29 insertions, 5 deletions

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 95ee9c6136..5d4ec2b39b 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -508,7 +508,7 @@ E_URI = "http://enlightenment.freedesktop.org/files"
 FREEBSD_MIRROR = "ftp://ftp.freebsd.org/pub/FreeBSD/"
 FREEDESKTOP_CVS = "cvs://anoncvs:anoncvs@anoncvs.freedesktop.org/cvs"
 FREESMARTPHONE_GIT = "git://git.freesmartphone.org"
-GENTOO_MIRROR = "http://distro.ibiblio.org/pub/linux/distributions/gentoo/distfiles"
+GENTOO_MIRROR = "http://distfiles.gentoo.org/distfiles"
 GNOME_GIT = "git://git.gnome.org"
 GNOME_MIRROR = "http://ftp.gnome.org/pub/GNOME/sources"
 GNU_MIRROR = "ftp://ftp.gnu.org/gnu"
diff --git a/conf/checksums.ini b/conf/checksums.ini
index d8392d1507..2d7e77c515 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -1870,6 +1870,10 @@ sha256=9d1fff10d391cb64890bb8e0050d3f023520a8dd5aee43c4d3f9c6f8611da668
 md5=a3bcd50138d29c1d23a0d378edb52dfe
 sha256=019b98442d4debcd74d759043884b4b0ed48a2bef425649bfe3061d00e854fc5
 
+[ftp://www.at91.com/pub/buildroot/at91bootstrap-2.11.tar.bz2]
+md5=8962bd639d189e1d3328b6c056d96099
+sha256=09ef85da45a086c27b6a43a457f81bf44913e7fa2e854e72281aa3c25c00874b
+
 [ftp://www.at91.com/pub/buildroot/at91bootstrap-2.3.tar.bz2]
 md5=a29b3f07e623d20894ab23335daf5da5
 sha256=d598d078c24a24b13eac8a219a4ab05499909404cbd4efcb8641fdcde28464c0
@@ -3910,6 +3914,10 @@ sha256=73f3b92c0f85ab2bf0f9bb18f928a8b84cacdbb459f3a530df540d4ddf134405
 md5=7bc5c89870d47c88f407fcfd666c739d
 sha256=102bb7a5d329dd6831bc8a923fa0b5d7634efa215e3d15377630d9b738df49da
 
+[http://www.kernel.org/pub/linux/network/connman/connman-0.19.tar.gz]
+md5=3d61c5db55d225c3efbf4c950dc0842f
+sha256=cc4a4b73d8d7b0e19dd2dd274ba91acb67b14c84fc448a921d1359e25e4d2df0
+
 [ftp://ftp.moblin.org/connman/releases/connman-0.2.tar.gz]
 md5=bf48aa07d3c1e5fe272c7f139bc01fc9
 sha256=eacc3c57cffb411b09d834d2225323cde5676165b5d2fc2a27b16cde98e3ba97
@@ -10174,6 +10182,10 @@ sha256=cae6ed86296d01be98ee3be0c224c4323eee508941a7f162a0366d56655afe06
 md5=62749c6cdf28ce31aae335092fa107df
 sha256=cae6ed86296d01be98ee3be0c224c4323eee508941a7f162a0366d56655afe06
 
+[http://downloads.sourceforge.net/hdparm/hdparm-9.15.tar.gz]
+md5=0524dd10ad986285ff4eeb3507f7471c
+sha256=689a413119c4d670ed95b9ac24511655c4805db678ad93866ab1036a0ba4d6bf
+
 [http://handhelds.org/~zecke/oe_packages/hexatrolic-103beta3-zecke1.tar.bz2]
 md5=1d9420e8b5a6d5fa491c458ffafd4adb
 sha256=b60a5358e56e676529e7d3d655d5107a76b9a2434e38952711fea794f65721ce
@@ -14446,6 +14458,10 @@ sha256=d112f79489d5deabc0cbb48c6192353d488d9e62c28752eda091f585f2e41176
 md5=df2447c23750ef2b4a314200feacc2ee
 sha256=c9bdc5820bc283dcfefba4d4f632c9083adffe5a06c21e089ee123209d229ecf
 
+[http://downloads.sourceforge.net/libusb/libusb-1.0.1.tar.bz2]
+md5=8fb0e066678a0d294894b5b2969cb4b3
+sha256=510b9c7339e878324066ec1cb74c0f67d5df858065155a3239999ff911257d45
+
 [http://downloads.sourceforge.net/libusb/libusb-compat-0.1.0-beta1.tar.bz2]
 md5=3d9f7c3966d24c6e2d58becac96e4e27
 sha256=9365108d71cecb78055de4df6eeb2fadf0fe9143ef105bcb6934dcf391983a49
@@ -22834,6 +22850,10 @@ sha256=404df2c479517020290be9847191523c1fcbd3e929e8bb1191a7832209d04af8
 md5=490d13c141ba7b4a96582541ea83a461
 sha256=944ab9cfcfc9a4bd7efeecf32ea609fa6517970a9708c44eee6d5750c4ff8e0c
 
+[http://mirrors.m0k.org/transmission/files/transmission-1.61.tar.bz2]
+md5=0b0428f4a6237a64dc8b7d378ace3f06
+sha256=3bc5bf49ed02a3d93b4b9b71c7814960e972c1bde4e9fb83b2cd500c83ae4a9a
+
 [http://xorg.freedesktop.org/releases/individual/proto/trapproto-3.4.3.tar.bz2]
 md5=3b713239e5e6b269b31cb665563358df
 sha256=ff32a0d3bc696cadc3457be9c85e9818af2b6daa2f159188bb01aad7e932a0e1
@@ -23190,6 +23210,10 @@ sha256=c750c8180057385eaa0844f1148d6f0223b986da322773195eab44b33b97c19f
 md5=b2c104938c1c3eb47e7605432bbd3157
 sha256=c750c8180057385eaa0844f1148d6f0223b986da322773195eab44b33b97c19f
 
+[http://uim.freedesktop.org/releases/uim/stable/uim-1.3.1.tar.bz2]
+md5=2832e23d4778bbacbfa4b49bf642d667
+sha256=ed2cfa15018a4fd2557e875f66fcb3f0b9dabe12fa0700aa2f11cca69c2cb256
+
 [http://uim.googlecode.com/files/uim-1.3.1.tar.bz2]
 md5=2832e23d4778bbacbfa4b49bf642d667
 sha256=ed2cfa15018a4fd2557e875f66fcb3f0b9dabe12fa0700aa2f11cca69c2cb256
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index bd78008dd0..add9586c7e 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -111,7 +111,7 @@ SRCREV_pn-libowl ?= "277"
 SRCREV_pn-libxcalibrate ?= "209d83af61ed38a002c8096377deac292b3e396c"
 SRCREV_pn-libxosd ?= "627"
 SRCREV_pn-linux-bfin ?= "3758"
-SRCREV_pn-linux-bug ?= "8996"
+SRCREV_pn-linux-bug ?= "9110"
 SRCREV_pn-linux-hackndev-2.6 ?= "1308"
 SRCREV_pn-linux-ixp4xx ?= "1089"
 SRCREV_pn-linux-openmoko-2.6.24 ?= "fb42ce6724576fc173faf8abfb04aa2c36d213b7"
@@ -131,7 +131,7 @@ SRCREV_pn-matchbox-panel-2 ?= "1626"
 SRCREV_pn-matchbox-stroke ?= "1820"
 SRCREV_pn-mickeydbus ?= "f894801916cc4d0e912e4553490dc215276c52a9"
 SRCREV_pn-mickeyterm ?= "f894801916cc4d0e912e4553490dc215276c52a9"
-SRCREV_pn-midori ?= "f30dff433056e239ca775d16f343bdb249f1a338"
+SRCREV_pn-midori ?= "eaaed697bf962862b6f393c6b1aceeb04df7414b"
 SRCREV_pn-moblin-proto ?= "8f2cb524fe06555182c25b4ba3202d7b368ac0ce"
 SRCREV_pn-moko-gtk-engine ?= "4734"
 SRCREV_pn-mokoko ?= "127"
@@ -249,7 +249,7 @@ SRCREV_pn-usbpath-native ?= "3172"
 SRCREV-pn-vala-dbus-binding-tool-native ?= "55a6bc5dd032731d89c238d274b2898ef02d12f8"
 SRCREV_pn-vala-terminal ?= "94117f453ce884e9c30b611fae6fc19f85f98f2b"
 SRCREV_pn-vala-native ?= "6cf030120cd7f6a76a5d766d7420aea847e02cfd"
-SRCREV_pn-webkit-gtk ?= "43434"
+SRCREV_pn-webkit-gtk ?= "43635"
 SRCREV_pn-wlan-ng-modules ?= "1859"
 SRCREV_pn-wlan-ng-utils ?= "1859"
 SRCREV_pn-wmiconfig ?= "4522"
diff --git a/conf/machine/include/kirkwood.inc b/conf/machine/include/kirkwood.inc
index f58feb686c..9e6f130c35 100644
--- a/conf/machine/include/kirkwood.inc
+++ b/conf/machine/include/kirkwood.inc
@@ -11,7 +11,7 @@ USE_DEVFS = "0"
 PREFERRED_PROVIDER_virtual/bootloader = ""
 PREFERRED_PROVIDER_virtual/kernel = "linux-kirkwood"
 
-MACHINE_KERNEL_PR = "r1"
+MACHINE_KERNEL_PR = "r5"
 
 IMAGE_FSTYPES += "tar.gz ubi"
 SERIAL_CONSOLE = "ttyS0 115200"