From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751887Ab0LPWdl (ORCPT ); Thu, 16 Dec 2010 17:33:41 -0500 Received: from chilli.pcug.org.au ([203.10.76.44]:59230 "EHLO smtps.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751119Ab0LPWdj (ORCPT ); Thu, 16 Dec 2010 17:33:39 -0500 Date: Fri, 17 Dec 2010 09:33:30 +1100 From: Stephen Rothwell To: Greg KH Cc: Felipe Balbi , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Bob Liu , Mike Frysinger Subject: Re: linux-next: manual merge of the usb tree with Linus' tree Message-Id: <20101217093330.32adedb4.sfr@canb.auug.org.au> In-Reply-To: <20101216181429.GA19012@kroah.com> References: <20101216140122.ca745f1f.sfr@canb.auug.org.au> <20101216030857.GA12785@kroah.com> <20101216080527.GA2601@legolas.emea.dhcp.ti.com> <20101216084552.GD2601@legolas.emea.dhcp.ti.com> <20101216155225.GA31363@kroah.com> <20101216155554.GA9552@legolas.emea.dhcp.ti.com> <20101216174418.GA3849@kroah.com> <20101216181429.GA19012@kroah.com> X-Mailer: Sylpheed 3.0.2 (GTK+ 2.20.1; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: multipart/signed; protocol="application/pgp-signature"; micalg="PGP-SHA1"; boundary="Signature=_Fri__17_Dec_2010_09_33_30_+1100_rZvMNZPlWDtb0nGy" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Signature=_Fri__17_Dec_2010_09_33_30_+1100_rZvMNZPlWDtb0nGy Content-Type: text/plain; charset=US-ASCII Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi Greg, Felipe, On Thu, 16 Dec 2010 10:14:29 -0800 Greg KH wrote: > > Ok, now merged and pushed out. Stephen, there shouldn't be any merge > errors with the next linux-next and the usb-next branches anymore. Thanks guys. --=20 Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ --Signature=_Fri__17_Dec_2010_09_33_30_+1100_rZvMNZPlWDtb0nGy Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) iQEcBAEBAgAGBQJNCpO6AAoJEDMEi1NhKgbs7vwH/35qCOLfl4sMgdA93K5aIQXW UQdMMeUmlT8/m0zaHOrFcockznx4J9NmlH8DO4vIjkObtTYZlWv3+xrd72Nv7dry pJoNQx/f9x0ssTbOIZ39u/TbScW3xkM5vtlAHq1O3b8xpIXfBLIw3Z8G5tlU4hLs byvQ7dr8nOp4Yc6QLcahnljVBYqe2HUaG99bstYLIxMHRGrrdcG3kun+a1wV60dP mbSXlhc6NdufXCRaymR/ZVfMSsyT1/BgYEHEzQIWSfX+n7yAtMnzsn765Wn8I9If hsotKelDNSB/R8DgussoPyAJRVDlpDnlh1q3XA6Bj70wqxt+dxzndthP0RFx+GE= =dPIv -----END PGP SIGNATURE----- --Signature=_Fri__17_Dec_2010_09_33_30_+1100_rZvMNZPlWDtb0nGy--