Return-Path: Date: Wed, 9 May 2012 10:52:47 -0700 (PDT) From: Mat Martineau To: Gustavo Padovan cc: linux-bluetooth@vger.kernel.org Subject: Re: bluetooth-next rebased on top of wireless-next In-Reply-To: <20120509040426.GB2362@joana> Message-ID: References: <20120509040426.GB2362@joana> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; format=flowed; charset=US-ASCII Sender: linux-bluetooth-owner@vger.kernel.org List-ID: 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. I have an upcoming patch set for bluetooth-next that depends on patches in the bluetooth branch. -- Mat Martineau Employee of Qualcomm Innovation Center, Inc. Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum