Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 6 Nov 2007 01:42:41 +0000 (17:42 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 6 Nov 2007 01:42:41 +0000 (17:42 -0800)
commit61edab8d144ae7b4d7206b91adec947579a73c0a
tree61a38f0e119405eb3978bb30df78ff25ab690809
parent2655e2cee2d77459fcb7e10228259e4ee0328697
parentf2511f13daaf00fdd206bee7b108f75923a613c6
Merge branch 'upstream-linus' of /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