Return-Path: <cyrus@holtmann.org>
Date: Wed, 9 May 2012 15:19:29 -0300
From: Gustavo Padovan <gustavo@padovan.org>
To: Mat Martineau <mathewm@codeaurora.org>
Cc: linux-bluetooth@vger.kernel.org
Subject: Re: bluetooth-next rebased on top of wireless-next
Message-ID: <20120509181929.GG2362@joana>
References: <20120509040426.GB2362@joana>
 <alpine.DEB.2.02.1205091037080.2090@mathewm-linux>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
In-Reply-To: <alpine.DEB.2.02.1205091037080.2090@mathewm-linux>
Sender: linux-bluetooth-owner@vger.kernel.org
List-ID: <linux-bluetooth.vger.kernel.org>

Hi Mat,

* Mat Martineau <mathewm@codeaurora.org> [2012-05-09 10:52:47 -0700]:

> 
> Gustavo -
> 
> On Wed, 9 May 2012, Gustavo Padovan wrote:
> 
> >Hi Everyone,
> >
> >Unfortunately we were forced to rebase the bluetooth-next tree on top of the
> >wireless-next tree of today (commit 341352d), we apologize for the problems
> >this may cause to you.
> >
> >And there is more, I also had to edit some commits to fix coding style issues.
> >So don't worry if some piece of the code looks slightly different from what
> >you wrote, it was just style fix.
> >
> >Our apologizes!
> 
> Any plans for merging bluetooth in to bluetooth-next?  I assume
> you're waiting for John to pull the bluetooth branch.

Exactly, this should happen soon.

	Gustavo