From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 24 Jun 2011 19:25:51 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: v3.1-rc1~316^2~350^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=36099365c7cc64e5184b66b6eb094950a13f540c;p=pandora-kernel.git

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

Conflicts:
	drivers/net/wireless/rtlwifi/pci.c
	include/linux/netlink.h
---

36099365c7cc64e5184b66b6eb094950a13f540c
Reading git-diff-tree failed