merge of '1eb5618e7a9c615ad27d9d1ed9285311c3a0e2cc'

     and 'ace1edeb5a57c79c092da74aa3e679bf270021df'

2 files changed, 10 insertions, 10 deletions

diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 2ee9cf29f4..864f6fe178 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -25,14 +25,14 @@ SRCREV_pn-fstests ?= "204"
 SRCREV_pn-gconf-dbus ?= "606"
 SRCREV_pn-gnuradio ?= "6377"
 SRCREV_pn-gypsy ?= "56"
-SRCREV_pn-hildon-1 ?= "14173"
+SRCREV_pn-hildon-1 ?= "14429"
 SRCREV_pn-kismet ?= "2285"
 SRCREV_pn-kismet-newcore ?= "2285"
 SRCREV_pn-libfakekey ?= "1455"
 SRCREV_pn-libgsmd ?= "3074"
 SRCREV_pn-libgsmd-devel ?= "3293"
 SRCREV_pn-libjana ?= "665"
-SRCREV_pn-libmokogsmd2 ?= "2950"
+SRCREV_pn-libmokogsmd2 ?= "3362"
 SRCREV_pn-libmokojournal2 ?= "3217"
 SRCREV_pn-libmokopanelui2 ?= "3226"
 SRCREV_pn-libmokoui2 ?= "3229"
@@ -43,14 +43,14 @@ SRCREV_pn-linux-hackndev-2.6 ?= "1308"
 SRCREV_pn-linux-openmoko ?= "3238"
 SRCREV_pn-llvm-gcc4 ?= "374"
 SRCREV_pn-llvm-gcc4-cross ?= "374"
-SRCREV_pn-maemo-mapper ?= "108"
+SRCREV_pn-maemo-mapper ?= "118"
 SRCREV_pn-matchbox-desktop-2 ?= "1778"
 SRCREV_pn-matchbox-keyboard ?= "1739"
 SRCREV_pn-matchbox-keyboard-inputmethod ?= "1739"
 SRCREV_pn-matchbox-panel-2 ?= "1626"
 SRCREV_pn-moko-gtk-engine ?= "3207"
 SRCREV_pn-mpd-alsa ?= "6952"
-SRCREV_pn-neod ?= "2956"
+SRCREV_pn-neod ?= "3358"
 SRCREV_pn-oh-puzzles ?= "22"
 SRCREV_pn-osb-browser ?= "125"
 SRCREV_pn-osb-jscore ?= "117"
@@ -58,7 +58,7 @@ SRCREV_pn-osb-nrcit ?= "125"
 SRCREV_pn-osb-nrcore ?= "126"
 SRCREV_pn-openmoko-appearance ?= "3239"
 SRCREV_pn-openmoko-appmanager ?= "1851"
-SRCREV_pn-openmoko-appmanager2 ?= "3338"
+SRCREV_pn-openmoko-appmanager2 ?= "3382"
 SRCREV_pn-openmoko-browser2 ?= "3249"
 SRCREV_pn-openmoko-calculator ?= "2404"
 SRCREV_pn-openmoko-calculator2 ?= "3235"
@@ -69,7 +69,7 @@ SRCREV_pn-openmoko-contacts2 ?= "358"
 SRCREV_pn-openmoko-dates ?= "467"
 SRCREV_pn-openmoko-dates2 ?= "659"
 SRCREV_pn-openmoko-dialer ?= "2811"
-SRCREV_pn-openmoko-dialer2 ?= "3298"
+SRCREV_pn-openmoko-dialer2 ?= "3361"
 SRCREV_pn-openmoko-feedreader2 ?= "3080"
 SRCREV_pn-openmoko-finger-demo ?= "1671"
 SRCREV_pn-openmoko-firststart2 ?= "3158"
@@ -81,7 +81,7 @@ SRCREV_pn-openmoko-keyboard ?= "1631"
 SRCREV_pn-openmoko-libs ?= "2367"
 SRCREV_pn-openmoko-mediaplayer2 ?= "3300"
 SRCREV_pn-openmoko-messages ?= "2276"
-SRCREV_pn-openmoko-panel-battery ?= "3272"
+SRCREV_pn-openmoko-panel-battery ?= "3360"
 SRCREV_pn-openmoko-panel-bt ?= "2896"
 SRCREV_pn-openmoko-panel-clock ?= "2567"
 SRCREV_pn-openmoko-panel-demo ?= "1622"
@@ -89,7 +89,7 @@ SRCREV_pn-openmoko-panel-demo-simple ?= "1328"
 SRCREV_pn-openmoko-panel-gps ?= "2900"
 SRCREV_pn-openmoko-panel-gsm ?= "3185"
 SRCREV_pn-openmoko-panel-mainmenu ?= "2567"
-SRCREV_pn-openmoko-panel-usb ?= "2893"
+SRCREV_pn-openmoko-panel-usb ?= "3360"
 SRCREV_pn-openmoko-session ?= "152"
 SRCREV_pn-openmoko-simplemediaplayer ?= "1688"
 SRCREV_pn-openmoko-sound-theme-standard2 ?= "3192"
@@ -106,7 +106,7 @@ SRCREV_pn-openmoko-theme-standard2-qvga ?= "3289"
 SRCREV_pn-openmoko-today ?= "3056"
 SRCREV_pn-openmoko-today2 ?= "3342"
 SRCREV_pn-openmoko-today2-folders ?= "2680"
-SRCREV_pn-openmoko-worldclock2 ?= "3301"
+SRCREV_pn-openmoko-worldclock2 ?= "3365"
 SRCREV_pn-openocd ?= "206"
 SRCREV_pn-openocd-native ?= "206"
 SRCREV_pn-oprofileui ?= "160"
diff --git a/conf/machine/simpad.conf b/conf/machine/simpad.conf
index 3b527293df..ab3da912ba 100644
--- a/conf/machine/simpad.conf
+++ b/conf/machine/simpad.conf
@@ -2,7 +2,7 @@
 #@NAME: SIEMENS SIMpad SL4, SIEMENS SIMpad CL4, SIEMENS SIMpad SLC, Telekom T-Sinus PAD
 #@DESCRIPTION: Machine configuration for the SA1100 based SIEMENS SIMpad and Telekom T-Sinus PAD devices
 
-MACHINE_KERNEL_VERSION ?= "2.4"
+MACHINE_KERNEL_VERSION ?= "2.6"
 
 TARGET_ARCH = "arm"