From: David S. Miller <davem@davemloft.net>
Date: Mon, 2 Mar 2009 05:35:16 +0000 (-0800)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.30-rc1~662^2~450
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aa4abc9bcce0d2a7ec189e897f8f8c58ca04643b;p=pandora-kernel.git

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

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-tx.c
	net/8021q/vlan_core.c
	net/core/dev.c
---

aa4abc9bcce0d2a7ec189e897f8f8c58ca04643b
Reading git-diff-tree failed