>> (Unrelated white space changes are a pest :-() >> >> I fixed it up (see below) and can carry the fix as necessary (no action >> is required). > > Thanks, I've merged the char-misc-next branch into 3.11-rc3, so this > merge problem should no longer be there. I've preferred the blank line there as these ifs became a bit dense nevertheless thanks for taking care of it. Tomas PS: sorry for the previous HTML mistake. -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html