From: David S. Miller <davem@davemloft.net>
Date: Fri, 31 Oct 2008 07:17:34 +0000 (-0700)
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~931
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a1744d3bee19d3b9cbfb825ab316a101b9c9f109;p=pandora-kernel.git

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

Conflicts:

	drivers/net/wireless/p54/p54common.c
---

a1744d3bee19d3b9cbfb825ab316a101b9c9f109
Reading git-diff-tree failed