]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit5c5ce2ffcce6479553f004967e355c138f6350e1
tree61a38f0e119405eb3978bb30df78ff25ab690809
parent35a801532c5277ecc9b56e37a8b058affb94bbd6
parentb9ed131d7140b640851ada8d688d9e7be8cd6eba
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