From: John W. Linville <linville@tuxdriver.com>
Date: Tue, 29 Jan 2013 19:03:20 +0000 (-0500)
Subject: Merge branch 'for-linville' of git://git.kernel.org/pub/scm/linux/kernel/git/luca... 
X-Git-Tag: v3.9-rc1~139^2~2^2^2~42^2~50
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=56e1bd770614da94f35e88c150cf9edf8d0b57a2;p=pandora-kernel.git

Merge branch 'for-linville' of git://git./linux/kernel/git/luca/wl12xx

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

56e1bd770614da94f35e88c150cf9edf8d0b57a2
Reading git-diff-tree failed