]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6b0100d 71914db)
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 25 Sep 2007 15:52:26 +0000 (08:52 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 25 Sep 2007 15:52:26 +0000 (08:52 -0700)
commit6ace0a81a550105d1ca2445a11c7a92bc8636e5a
tree3f13686733c69345bf364fb737dd2a66c39555ddtree | snapshot
parent6b0100ded25151e6eed88dcead326c13da2c0e0bcommit | diff
parent71914dbf92a2db3ea90ec7f332f33276423d256dcommit | diff
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:
  Revert "drivers/net/pcmcia/3c589_cs: fix port configuration switcheroo"
  sky2: be more selective about FIFO watchdog
  sky2: FE+ Phy initialization
  r8169: workaround against ignored TxPoll writes (8168)
  r8169: correct phy parameters for the 8110SC
Linux Kernel Source Tree.