]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7fc5b1e d8e95e5)
Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/shemminger...
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 10 May 2006 21:59:29 +0000 (14:59 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 10 May 2006 21:59:29 +0000 (14:59 -0700)
* 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/shemminger/netdev-2.6:
  sis900: phy for FoxCon motherboard
  dl2k: use DMA_48BIT_MASK constant
  phy: mdiobus_register(): initialize all phy_map entries
  sky2: ifdown kills irq mask

1  2 
drivers/net/sky2.c patch | diff1 | diff2 | blob | history

diff --cc drivers/net/sky2.c
Simple merge
Linux 2.6 source tree