commit d3143e71a95fe504c3d2d4a3b7aac126a588b1ac
author Linus Torvalds <torvalds@woody.linux-foundation.org> Tue Jan 30 08:39:49 2007 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> Tue Jan 30 08:39:49 2007 -0800
tree 78cf757c2896c3b5977e9a53d77642916ba7523e
parent b20c8453a7d6e8d63c0f05ba3e38d9428c8091b1
parent 90afd0e574a1a739aeb62e30d556ebf0289389e5

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:
  Broadcom 4400 resume small fix
  b44: src_desc->addr is little-endian
  e100: fix irq leak on suspend/resume
  bonding: ARP monitoring broken on x86_64
  ehea: Fixed missing tasklet_kill() call
  ehea: Fixed wrong jumbo frames status query
  82596 warning fixes
  FS_ENET: OF-related fixup for FEC and SCC MAC's
  net: ifb error path loop fix
  b44: Fix frequent link changes