From: David S. Miller <davem@davemloft.net>
Date: Tue, 10 Jun 2008 09:22:26 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.27-rc1~969^2~336
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=65b53e4cc90e59936733b3b95b9451d2ca47528d;p=pandora-kernel.git

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

Conflicts:

	drivers/net/tg3.c
	drivers/net/wireless/rt2x00/rt2x00dev.c
	net/mac80211/ieee80211_i.h
---

65b53e4cc90e59936733b3b95b9451d2ca47528d
Reading git-diff-tree failed