From mboxrd@z Thu Jan  1 00:00:00 1970
From: Tomas Winkler <tomasw@gmail.com>
Subject: Re: linux-next: manual merge of the char-misc tree with Linus' tree
Date: Tue, 30 Jul 2013 01:16:38 +0300
Message-ID: <CA+i0qc7+Q416voe3sQLd3WUbu2kWRcduw9ayVq9+R+eL4zPEbA@mail.gmail.com>
References: <20130729150129.76a9fab4023ee22c940b7920@canb.auug.org.au>
	<20130729192649.GA9191@kroah.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Return-path: <linux-next-owner@vger.kernel.org>
Received: from mail-vb0-f47.google.com ([209.85.212.47]:39367 "EHLO
	mail-vb0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1754671Ab3G2WQj (ORCPT
	<rfc822;linux-next@vger.kernel.org>); Mon, 29 Jul 2013 18:16:39 -0400
In-Reply-To: <20130729192649.GA9191@kroah.com>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Greg KH <greg@kroah.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>, Arnd Bergmann <arnd@arndb.de>, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org

>> (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.