From mboxrd@z Thu Jan 1 00:00:00 1970 From: Olof Johansson Subject: Re: [GIT PULL] two trivial omap build error fixes for v3.8 merge window Date: Thu, 20 Dec 2012 08:03:46 -0800 Message-ID: <20121220160346.GC1034@quad.lixom.net> References: <20121219171828.GP4989@atomide.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Content-Disposition: inline In-Reply-To: <20121219171828.GP4989@atomide.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=m.gmane.org@lists.infradead.org To: Tony Lindgren Cc: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Arnd Bergmann List-Id: linux-omap@vger.kernel.org On Wed, Dec 19, 2012 at 09:18:28AM -0800, Tony Lindgren wrote: > Hi Arnd & Olof, > > Here's few more trivial build fixes caused by the merge > conflicts. > > Tony > > > The following changes since commit 5031a2a7c12b837a0913c4139ebeb6bbff5e1aa5: > > Merge tag 'for-v3.8-part2' of git://git.infradead.org/battery-2.6 (2012-12-19 08:14:08 -0800) > > are available in the git repository at: > > > git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.8/fixes-for-merge-window-part2-signed Thanks, pulled. -Olof From mboxrd@z Thu Jan 1 00:00:00 1970 From: olof@lixom.net (Olof Johansson) Date: Thu, 20 Dec 2012 08:03:46 -0800 Subject: [GIT PULL] two trivial omap build error fixes for v3.8 merge window In-Reply-To: <20121219171828.GP4989@atomide.com> References: <20121219171828.GP4989@atomide.com> Message-ID: <20121220160346.GC1034@quad.lixom.net> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Wed, Dec 19, 2012 at 09:18:28AM -0800, Tony Lindgren wrote: > Hi Arnd & Olof, > > Here's few more trivial build fixes caused by the merge > conflicts. > > Tony > > > The following changes since commit 5031a2a7c12b837a0913c4139ebeb6bbff5e1aa5: > > Merge tag 'for-v3.8-part2' of git://git.infradead.org/battery-2.6 (2012-12-19 08:14:08 -0800) > > are available in the git repository at: > > > git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.8/fixes-for-merge-window-part2-signed Thanks, pulled. -Olof