From: David S. Miller <davem@davemloft.net>
Date: Tue, 11 Nov 2008 23:43:02 +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~737
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7e452baf6b96b5aeba097afd91501d33d390cc97;p=pandora-kernel.git

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

Conflicts:

	drivers/message/fusion/mptlan.c
	drivers/net/sfc/ethtool.c
	net/mac80211/debugfs_sta.c
---

7e452baf6b96b5aeba097afd91501d33d390cc97
Reading git-diff-tree failed