Re: linux-next: manual merge of the char-misc tree with Linus' tree

[Tomas Winkler]

>> (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-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/