From: David S. Miller <davem@davemloft.net>
Date: Tue, 17 Jun 2008 01:25:48 +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~315
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=caea902f72b053fd0c76d0d3b6b2e057beb3fc64;p=pandora-kernel.git

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

Conflicts:

	drivers/net/wireless/rt2x00/Kconfig
	drivers/net/wireless/rt2x00/rt2x00usb.c
	net/sctp/protocol.c
---

caea902f72b053fd0c76d0d3b6b2e057beb3fc64
Reading git-diff-tree failed