From: David S. Miller <davem@davemloft.net>
Date: Fri, 10 Dec 2010 17:50:47 +0000 (-0800)
Subject: Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville... 
X-Git-Tag: v2.6.38-rc1~476^2~276
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1e13f863ca88014d9550876c05c939fdab1017d1;p=pandora-kernel.git

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

Conflicts:
	drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
---

1e13f863ca88014d9550876c05c939fdab1017d1
Reading git-diff-tree failed