]> pilppa.com Git - linux-2.6-omap-h63xx.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)
commit6e35c24b9f5b2f68732910d2138bc0eb1b477ab1
tree350c60fc080ec1f6dee8c1eb4c37aee7ee0cfce9
parentd0f29485686d9d1c4f31240953a742d5dd4fdb72
parente47b207a5bcb73bb097f94d9fe364f50737b0eb2
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