Merge git://git.infradead.org/~dwmw2/ideapad-2.6