tree e42d5834dd5b0844552c076c1d264ab0e35396f6
parent 936813a8807c5684c6a97f1081b31027403d4a93
parent 1f1bd5fc326a46d8c49132260f661b7cc954846f
author Linus Torvalds <torvalds@g5.osdl.org> 1151460950 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1151460950 -0700

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:
  [netdrvr] Remove long-unused bits from Becker template drivers
  [netdrvr] natsemi: minor cleanups
  [netdrvr] natsemi: Separate out media initialization code
  [PATCH] WAN: update info page for a bunch of my drivers
  [PATCH] drivers/net/hamradio/dmascc.c: fix section mismatch
  [PATCH] Fix phy id for LXT971A/LXT972A
  [PATCH] DM9000 - minor code cleanups
  [PATCH] DM9000 - do no re-init spin lock
  [PATCH] DM9000 - check for MAC left in by bootloader
  [PATCH] DM9000 - better checks for platform resources