* Peter Ujfalusi <peter.ujfalusi@xxxxxxxxx> [081002 16:03]: > > Hello, > > the diff between l-o and mainline are these commits regarding to omap-keypad.c: > > commit fdee8764947cde1e6933e7d981ce5b9de00e83e6 > Author: Tony Lindgren <tony@xxxxxxxxxxx> > Merge current mainline tree into linux-omap tree This should not be needed, but it's always worth checking there was no automerge weirdness introduced by that patch. Tony -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html