From: David S. Miller <davem@davemloft.net>
Date: Fri, 21 Nov 2008 00:44:00 +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~616
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6ab33d51713d6d60c7677c0d020910a8cb37e513;p=pandora-kernel.git

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

Conflicts:

	drivers/net/ixgbe/ixgbe_main.c
	include/net/mac80211.h
	net/phonet/af_phonet.c
---

6ab33d51713d6d60c7677c0d020910a8cb37e513
Reading git-diff-tree failed