>>>>> "Ingo" == Ingo Molnar <[EMAIL PROTECTED]> writes:
>> If instead of pulling master into the cfs branch, I rather switch to >> the master branch and pull the cfs branch into that, it works. Ingo> ah! Could you please do a git-diff between the broken and the working Ingo> tree, to see what got mismerged? Yes, I can work on that tonight. There will be some noise, but at least both have master == dc87c3985e9b442c60994308a96f887579addc39. -JimC -- James Cloos <[EMAIL PROTECTED]> OpenPGP: 1024D/ED7DAEA6 - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
