From mboxrd@z Thu Jan 1 00:00:00 1970 From: samuel.ortiz@intel.com (Samuel Ortiz) Date: Tue, 22 Mar 2011 12:03:10 +0100 Subject: [PATCH 3/3] mach-ux500: configure board for the TPS61052 regulator v2 In-Reply-To: References: <1299672196-4778-1-git-send-email-linus.walleij@stericsson.com> <20110317234241.GB32168@sortiz-mobl> Message-ID: <20110322110309.GC2347@sortiz-mobl> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Hi Linus, On Fri, Mar 18, 2011 at 08:26:23AM +0000, Linus Walleij wrote: > On Fri, Mar 18, 2011 at 12:42 AM, Samuel Ortiz wrote: > > On Wed, Mar 09, 2011 at 12:03:16PM +0000, Linus Walleij wrote: > >> From: Linus Walleij > >> > >> This registers the TPS61052 regulator to the ux500 MOP/HREF boards. > > > > Patch applied as well. > > Oh no please skip that patch for now. > > It will just collide with Russell's tree in -next and wreak havoc. > > I will take that platform data in the next merge window or through > Torvalds' tree after Russells and yours is merged, safest path. Sounds good to me. I dropped the patch. Cheers, Samuel. -- Intel Open Source Technology Centre http://oss.intel.com/ --------------------------------------------------------------------- Intel Corporation SAS (French simplified joint stock company) Registered headquarters: "Les Montalets"- 2, rue de Paris, 92196 Meudon Cedex, France Registration Number: 302 456 199 R.C.S. NANTERRE Capital: 4,572,000 Euros This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies.