On Fri, May 18, 2012 at 10:39 AM, Lee Jones [off-list ref] wrote:

The patch to disable SMSC911x registration was applied twice in the upstream
kernel by mistake. Git interpreted this as 'take the same entry from a
similar struct' which was close by. This was the wrong thing to do. This patch
rectifies this error and re-enables SMSC911x registration when Device Tree is
not enabled.

Acked-by: Linus Walleij <redacted>
Signed-off-by: Lee Jones <redacted>

Acked-by: Linus Walleij <redacted>

This patch needs to go first, and into the -rc series.

Thanks,
Linus Walleij