From: David S. Miller <davem@davemloft.net>
Date: Fri, 28 Mar 2008 01:48:56 +0000 (-0700)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.26-rc1~1138^2~290
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8e8e43843ba3ced0c657cbc0fdb10644ec60f772;p=pandora-kernel.git

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

Conflicts:

	drivers/net/usb/rndis_host.c
	drivers/net/wireless/b43/dma.c
	net/ipv6/ndisc.c
---

8e8e43843ba3ced0c657cbc0fdb10644ec60f772
Reading git-diff-tree failed