[alsa-devel] [PATCH 2/4] Input - arizona-haptics: Add driver haptics module on Arizona CODECs

[Dmitry Torokhov]

On Tue, Nov 27, 2012 at 08:00:02PM +0000, Mark Brown wrote:
> On Tue, Nov 27, 2012 at 11:56:44AM -0800, Dmitry Torokhov wrote:
> 
> > How do you want to merge it? My tree or some other?
> 
> I'm not terribly fussed but I guess as it's a new driver for the input
> tree merging via ASoC will minimise the potential for conflicts?  But
> we're near the merge window and I'm not sure that's likely anyway so if
> you want to apply it to your tree.

No, going through ASoc tree is fine with me. But given that it is a new
driver I think we should merge it quickly, especially since merge window
hasn't opened yet.

-- 
Dmitry