From: David S. Miller <davem@davemloft.net>
Date: Mon, 26 May 2008 06:26:10 +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~408
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=43154d08d6bb5c69aa0d0e3448fb348b4cd84e91;p=pandora-kernel.git

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

Conflicts:

	drivers/net/cpmac.c
	net/mac80211/mlme.c
---

43154d08d6bb5c69aa0d0e3448fb348b4cd84e91
Reading git-diff-tree failed