18 Jan
2008
18 Jan
'08
4:18 p.m.
On Jan 18, 2008, at 8:48 AM, Timur Tabi wrote:
Kumar Gala wrote:
Can you respin this. It doesn't apply cleanly to my tree.
Ok, but I have a feeling that the merge between alsa-git and powerpc- git is going to be ugly.
Really, it would seem ok in that the powerpc stuff is only touch files under arch/powerpc. So as long as the alsa is only touching files in drivers/ I think we'll be ok. 8610 my bitch a bit until the two exist in one place.
My merge conflict was because of updates/changes to booting-without- of.txt
- k