From: Luciano Coelho <coelho@ti.com>
Date: Thu, 21 Jun 2012 14:31:46 +0000 (+0300)
Subject: Merge branch 'wl12xx-next' into for-linville
X-Git-Tag: v3.6-rc1~125^2~57^2~246^2
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=da0b1baa94a9c11448e010a150280d0834b11c32;p=linux.git

Merge branch 'wl12xx-next' into for-linville

Conflicts:
	drivers/net/wireless/ti/wl18xx/main.c
---

da0b1baa94a9c11448e010a150280d0834b11c32