From: David S. Miller <davem@davemloft.net>
Date: Tue, 18 Mar 2008 07:37:55 +0000 (-0700)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.26-rc1~1138^2~415
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=577f99c1d08cf9cbdafd4e858dd13ff04d855090;p=pandora-kernel.git

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

Conflicts:

	drivers/net/wireless/rt2x00/rt2x00dev.c
	net/8021q/vlan_dev.c
---

577f99c1d08cf9cbdafd4e858dd13ff04d855090
Reading git-diff-tree failed