On Tue, Oct 02, 2012 at 12:18:00AM +0200, Jiri Kosina wrote:> Linus has just pulled from me, so if you could take care of this merge > conflict, that'd be awesome.Will do. Thanks.-- tejun