From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 25 Aug 2010 18:51:42 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: v2.6.37-rc1~147^2~679
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e569aa78ba01f7f66e016a4d57310fd041524d17;p=pandora-kernel.git

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

Conflicts:
	drivers/net/wireless/libertas/if_sdio.c
---

e569aa78ba01f7f66e016a4d57310fd041524d17
Reading git-diff-tree failed