From: Hauke Mehrtens <hauke@xxxxxxxxxx> Date: Wed, 28 Apr 2010 23:20:52 +0200 > Hi David, > > in your merge in 5c01d5669356e13f0fb468944c1dd4c6a7e978ad you added "int > i;" into wl1271_main.c which is unused in that function. > > This patch fixes the merge problem: > > Signed-off-by: Hauke Mehrtens <hauke@xxxxxxxxxx> Applied, thanks. -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
