From: David S. Miller <davem@davemloft.net>
Date: Fri, 23 Jul 2010 21:03:38 +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~107
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2a88e7e559f2358f4e1422d0b0c0278a74136581;p=pandora-kernel.git

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

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-commands.h
---

2a88e7e559f2358f4e1422d0b0c0278a74136581
Reading git-diff-tree failed