2a515571d7a43d5df7cb91d118a1d46b6142a
parent 0caab23e11c015559af81a4c0f4759ca05a5446a
parent 6a6bbd29a0284c1b9d33c324ba85f3ebb5509589
author Linus Torvalds <torvalds@g5.osdl.org> 1143078691 -0800
committer Linus Torvalds <torvalds@g5.osdl.org> 1143078691 -0800

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:
  [PATCH] Use of uninitialized variable in drivers/net/depca.c
  [PATCH] Use after free in net/tulip/de2104x.c
  [PATCH] sis900 adm7001 PHY support
  [PATCH] sky2: more ethtool stats
  [PATCH] s390: qeth :allow setting of attribute "route6" to "no_router".
  [PATCH] s390: qeth driver cleanups
  [PATCH] s390: qeth driver statistics fixes
  [PATCH] AMD Au1xx0: fix Ethernet TX stats
  [PATCH] fix spidernet build issue