]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commit
projects / linux-2.6-omap-h63xx.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit6314410dd1e9db1c0009b0f7b56cc771a4d1e85a
treedafb5034fbeb54ee608eb0740aae561f35782880tree | snapshot
parent7fc5b1e3a170d865f625e609c087cf8d84fd285dcommit | diff
parentd8e95e52a9db0e26b37f51ab5140b89da7c4b31ecommit | diff
Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/shemminger/netdev-2.6

* '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
drivers/net/sky2.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.