From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Tue, 6 Nov 2007 01:42:41 +0000 (-0800)
Subject: Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik... 
X-Git-Tag: v2.6.24-rc2~5
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=61edab8d144ae7b4d7206b91adec947579a73c0a;p=~shefty%2Frdma-dev.git

Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
  phylib: Silence driver registration
  phylib: Add ID for Marvell 88E1240
  82596: free nonexistent resource fix
  SUNHME: Fix missing NETIF_F_VLAN_CHALLENGED on PCI happy meals
---

61edab8d144ae7b4d7206b91adec947579a73c0a