From: David S. Miller <davem@davemloft.net>
Date: Fri, 2 Jul 2010 00:34:14 +0000 (-0700)
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~385
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=05318bc905467237d4aa68a701f6e92a2b332218;p=pandora-kernel.git

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

Conflicts:
	drivers/net/wireless/libertas/host.h
---

05318bc905467237d4aa68a701f6e92a2b332218
Reading git-diff-tree failed