From: David S. Miller <davem@davemloft.net>
Date: Thu, 27 Nov 2008 07:48:40 +0000 (-0800)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.29-rc1~581^2~378
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5b9ab2ec04ec1e1e53939768805612ac191d7ba2;p=pandora-kernel.git

Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:

	drivers/net/hp-plus.c
	drivers/net/wireless/ath5k/base.c
	drivers/net/wireless/ath9k/recv.c
	net/wireless/reg.c
---

5b9ab2ec04ec1e1e53939768805612ac191d7ba2
Reading git-diff-tree failed