From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 8 Oct 2010 19:39:28 +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~191^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e9a68707d736f4f73d7e209885d7b4c5c452b1dc;p=pandora-kernel.git

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

Conflicts:
	Documentation/feature-removal-schedule.txt
	drivers/net/wireless/ipw2x00/ipw2200.c
---

e9a68707d736f4f73d7e209885d7b4c5c452b1dc
Reading git-diff-tree failed