From: Luciano Coelho <coelho@ti.com>
Date: Fri, 18 Jan 2013 07:40:07 +0000 (+0200)
Subject: Merge branch 'wl12xx-next' into for-linville
X-Git-Tag: v3.9-rc1~139^2~2^2^2~42^2~50^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5b37649bbcfc14c1ecfb76c5b018dd686924b946;p=pandora-kernel.git

Merge branch 'wl12xx-next' into for-linville

Conflicts:
	drivers/net/wireless/ti/wl12xx/main.c
	drivers/net/wireless/ti/wlcore/wlcore.h
---

5b37649bbcfc14c1ecfb76c5b018dd686924b946
Reading git-diff-tree failed