From: Arnd Bergmann Date: Tue, 29 Jul 2014 11:04:27 +0000 (+0200) Subject: Merge tag 'omap-for-v3.16/n900-regression' of git://git.kernel.org/pub/scm/linux... X-Git-Tag: v3.16~19^2 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=a1ae5b128365f36a3fa2143cfa9de14fc71c51d8;p=linux.git Merge tag 'omap-for-v3.16/n900-regression' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes Merge "omap n900 regression fix for v3.16 rc series" from Tony Lindgren: Minimal regression fix for n900 display that got broken with enabling of twl4030 PM features. Turns out more work is needed before we can enable twl4030 PM on n900. I did not notice this earlier as I have my n900 in a rack and the display did not get enabled for device tree based booting until for v3.16. * tag 'omap-for-v3.16/n900-regression' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: dts: Revert enabling of twl configuration for n900 Signed-off-by: Arnd Bergmann --- a1ae5b128365f36a3fa2143cfa9de14fc71c51d8