From: Michael 'Mickey' Lauer <mickey@vanille-media.de>
Date: Fri, 2 Apr 2010 22:48:40 +0000 (+0200)
Subject: linux-leviathan: bump to master to incorporate GNUtoo's panel resume fixes
X-Git-Tag: Release-2010-05/1~152^2~6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c1b7233ffd014cfe057fcc6295a148e0765eb98b;p=openembedded.git

linux-leviathan: bump to master to incorporate GNUtoo's panel resume fixes
---

diff --git a/recipes/linux/linux-leviathan_git.bb b/recipes/linux/linux-leviathan_git.bb
index 77c9c0dae5..a58397e52b 100644
--- a/recipes/linux/linux-leviathan_git.bb
+++ b/recipes/linux/linux-leviathan_git.bb
@@ -2,16 +2,16 @@ require linux.inc
 DEPENDS = "android-image-utils-native"
 
 PV = "2.6.32+${PR}+gitr${SRCREV}"
-PR = "r4"
+PR = "r5"
 
 COMPATIBLE_MACHINE = "htcdream"
-CMDLINE = "console=tty0 no_console_suspend=1 root=/dev/mmcblk0p1 rootdelay=8 fbcon=rotate:1 panic=30 mem=110M"
+CMDLINE = "console=tty1 root=/dev/mmcblk0p1 rootdelay=8 fbcon=rotate:1 panic=30 mem=110M"
 
-SRCREV_LAST_GOOD = "0c68b1e8e4507090b8affbcedaac8efde6d0e9b7"
-SRCREV = "48afbaf19428893b7aec0a385970f300c38300c3"
+SRCREV_LAST_GOOD = "48afbaf19428893b7aec0a385970f300c38300c3"
+SRCREV = "4ca666904c624a54cf29a1b5b64b74c705b0eece"
 
 SRC_URI = "\
-  git://gitorious.org/htc-msm-2-6-32/leviathan-incoming.git;protocol=git \
+  git://gitorious.org/htc-msm-2-6-32/leviathan-incoming.git;protocol=git;branch=msm-gnuconform \
   file://defconfig \
 "
 S = "${WORKDIR}/git"