]> 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>
Thu, 29 Mar 2007 20:22:07 +0000 (13:22 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 29 Mar 2007 20:22:07 +0000 (13:22 -0700)
commitcbd035e7fdc1ca2a7e3283ec04d57256d37ccdfe
tree75ca0a8c5147c2b5bb7c226fd4f6e4cd6d8684cb
parent450663e08150b1fbbba3b90b268bda32c762b802
parent04290391484886f74a7a84b167bb3dad13201376
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:
  NetXen: Fix hardware access for ppc architecture.
  sis190: new PHY support
  atl1: save mac address on remove