From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 6 Feb 2012 19:26:39 +0000 (-0500)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: v3.4-rc1~177^2~376^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8926574c4d0055ca4c4a02d1f6b2c249d01a0621;p=pandora-kernel.git

Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next into for-davem

Conflicts:
	drivers/net/wireless/rtlwifi/rtl8192se/sw.c
---

8926574c4d0055ca4c4a02d1f6b2c249d01a0621
Reading git-diff-tree failed