From: Tony Lindgren Date: Wed, 11 Nov 2009 23:20:53 +0000 (-0800) Subject: Merge branch 'pm-upstream/pm-off' of ssh://master.kernel.org/pub/scm/linux/kernel... X-Git-Tag: v2.6.33-rc1~381^2~69^2~1 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4d0226042c05588be47b06bc1dbe7a09c9c540a4;p=karo-tx-linux.git Merge branch 'pm-upstream/pm-off' of ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into 7xx-iosplit-plat-merge --- 4d0226042c05588be47b06bc1dbe7a09c9c540a4