Mostly uptream cherry-picks with some SAUCE crack plucked from linux-next. These do not appear to have broken anything while actually fixing some bonding problems. rtg -- Tim Gardner tim.gardner at canonical.com