]> 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>
Wed, 24 Jan 2007 15:42:31 +0000 (07:42 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 24 Jan 2007 15:42:31 +0000 (07:42 -0800)
commit201563d4f98a4780319593ff48d3d30ec64a0d8e
tree350c60fc080ec1f6dee8c1eb4c37aee7ee0cfce9
parentd65446000800e142fe62d626e6e0c14c24a0eb3e
parent8f1e7d28e77801604c83853f5d7661bac621688b
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:
  mv643xx_eth: Fix race condition in mv643xx_eth_free_tx_descs
  s2io bogus memset