From: David S. Miller <davem@davemloft.net>
Date: Fri, 11 Jun 2010 18:34:06 +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~615
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=14599f1e341ee219abdd15f4eee5872d6f2d29f1;p=pandora-kernel.git

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

Conflicts:
	drivers/net/wireless/wl12xx/wl1271.h
	drivers/net/wireless/wl12xx/wl1271_cmd.h
---

14599f1e341ee219abdd15f4eee5872d6f2d29f1
Reading git-diff-tree failed