On Thu, 2008-11-20 at 10:13 +1100, Stephen Rothwell wrote: > Just overlapping additions. I fixed it up (see below) and can carry the > fix. The conflict could be eliminated by one of the two sets of changes > moving slightly in the files (I am hinting about the s390 ones here as > Paul does not like rebasing his tree ...). Ok, done. I moved the HCV_ICUV option before HVC_BEAT. -- blue skies, Martin. "Reality continues to ruin my life." - Calvin. -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
