From: John W. Linville <linville@tuxdriver.com>
Date: Tue, 21 Sep 2010 19:49:14 +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~373^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b618f6f885579a6237e5bf4582fa6167972ddef4;p=pandora-kernel.git

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

Conflicts:
	arch/arm/mach-omap2/board-omap3pandora.c
	drivers/net/wireless/ath/ath5k/base.c
---

b618f6f885579a6237e5bf4582fa6167972ddef4
Reading git-diff-tree failed