From: David S. Miller <davem@davemloft.net>
Date: Fri, 7 Nov 2008 06:43:03 +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~752
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9eeda9abd1faf489f3df9a1f557975f4c8650363;p=pandora-kernel.git

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

Conflicts:

	drivers/net/wireless/ath5k/base.c
	net/8021q/vlan_core.c
---

9eeda9abd1faf489f3df9a1f557975f4c8650363
Reading git-diff-tree failed