From: Luciano Coelho <coelho@ti.com>
Date: Tue, 4 Dec 2012 14:39:47 +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^2~34
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aaabee8b7686dfe49f10289cb4b7a817b99e5dd9;p=pandora-kernel.git

Merge branch 'wl12xx-next' into for-linville

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

aaabee8b7686dfe49f10289cb4b7a817b99e5dd9
Reading git-diff-tree failed