]> 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, 27 Jun 2007 16:59:52 +0000 (09:59 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 27 Jun 2007 16:59:52 +0000 (09:59 -0700)
commit51e3b7d89cd15dbda95eab5a65195ed4f60a67cb
tree5487ef8e4484e2f8cdc4792d07a76669ca53d0e0
parentaf1de3550e42440bb5fae4df15ff5de3cbb8190e
parent465647a4d15593d04c852be4a1c3d2de3d8e5973
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:
  2.6.22: ERROR: "__ucmpdi2" [drivers/net/s2io.ko] undefined!
  cxgb3 - fix register to stop bc/mc traffic
  au1000_eth: Fix warnings.