From: John W. Linville <linville@tuxdriver.com>
Date: Tue, 13 Jul 2010 19:57:29 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: v2.6.36-rc1~571^2~240^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e300d955debdadf599c36e47eb0bc16f5976215c;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/wl12xx/wl1271_cmd.h
---

e300d955debdadf599c36e47eb0bc16f5976215c
Reading git-diff-tree failed