lkml.org 
[lkml]   [2012]   [Sep]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the arm-soc tree with the sound-asoc tree
Hi all,

Today's linux-next merge of the arm-soc tree got conflicts in
sound/soc/omap/igep0020.c, sound/soc/omap/omap3beagle.c,
sound/soc/omap/omap3evm.c and sound/soc/omap/overo.c between commit
152c6e56f6a8 ("ASoC: Remove obsolete OMAP3 machine drivers") from the
sound-asoc tree and commit 2203747c9771 ("ARM: omap: move platform_data
definitions") from the arm-soc tree.

The former removed the files, so I did that and can carry the fix as
necessary (no action is required).

--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2012-09-20 08:41    [W:0.026 / U:2.680 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site