Home » Mailing list archives » linux-kernel » 2010 » December » 23

linux-next: manual merge of the sound tree with the s5p tree

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Stephen Rothwell
Subject: linux-next: manual merge of the sound tree with the s5p tree
Date: Wednesday, December 22, 2010 - 5:53 pm

Hi Takashi,

Today's linux-next merge of the sound tree got a conflict in
sound/soc/samsung/smdk_wm8580.c sound/soc/samsung/smdk_wm9713.c between
commit 7ca825bed699c77b218ead402202df384556950b ("ASoC: Samsung: Rename
DMA device") from the s5p tree and various commits from the sound tree.

I used the versions from the sound tree that seemed to be supersets of the
ones from the s5p tree.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
linux-next: manual merge of the sound tree with the s5p tree, Stephen Rothwell, (Wed Dec 22, 5:53 pm)
RE: linux-next: manual merge of the sound tree with the s5 ..., Kukjin Kim, (Thu Dec 23, 3:31 am)
Re: linux-next: manual merge of the sound tree with the s5 ..., Takashi Iwai, (Thu Dec 23, 4:03 am)
RE: linux-next: manual merge of the sound tree with the s5 ..., Kukjin Kim, (Thu Dec 23, 4:11 am)
Re: linux-next: manual merge of the sound tree with the s5 ..., Takashi Iwai, (Thu Dec 23, 4:17 am)
RE: linux-next: manual merge of the sound tree with the s5 ..., Kukjin Kim, (Thu Dec 23, 4:28 am)
Re: linux-next: manual merge of the sound tree with the s5 ..., Mark Brown, (Thu Dec 23, 4:50 am)
Re: linux-next: manual merge of the sound tree with the s5 ..., Piotr Hosowicz, (Thu Dec 23, 4:54 am)
Re: linux-next: manual merge of the sound tree with the s5 ..., Mark Brown, (Thu Dec 23, 4:56 am)
Re: linux-next: manual merge of the sound tree with the s5 ..., Takashi Iwai, (Thu Dec 23, 7:30 am)
RE: linux-next: manual merge of the sound tree with the s5 ..., Kukjin Kim, (Thu Dec 23, 6:32 pm)
Re: linux-next: manual merge of the sound tree with the s5 ..., Russell King, (Fri Dec 24, 1:27 am)
RE: linux-next: manual merge of the sound tree with the s5 ..., Kukjin Kim, (Mon Dec 27, 7:24 pm)
Re: linux-next: manual merge of the sound tree with the s5 ..., Mark Brown, (Tue Dec 28, 8:39 am)
Re: linux-next: manual merge of the sound tree with the s5 ..., Russell King, (Tue Dec 28, 9:23 am)
Re: linux-next: manual merge of the sound tree with the s5 ..., Mark Brown, (Tue Dec 28, 9:40 am)
RE: linux-next: manual merge of the sound tree with the s5 ..., Kukjin Kim, (Wed Dec 29, 5:54 pm)