tree b2c5a6c3a9942785720a77eac3ea6562ed636c2b
parent 0c7bb31db0e35d4b772fac452b722460ca368acf
parent 78eb77a9cc3af73e3cd86a197b7c1f28fd840978
author Linus Torvalds <torvalds@g5.osdl.org> 1162806403 -0800
committer Linus Torvalds <torvalds@g5.osdl.org> 1162806403 -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] Kconfig: remove redundant NETDEVICES depends
  [PATCH] ehea: 64K page support fix
  [PATCH] ehea: Removed redundant define
  [PATCH] ehea: Nullpointer dereferencation fix
  [PATCH] bcm43xx: fix unexpected LED control values in BCM4303 sprom
  [PATCH] bcm43xx: Fix low-traffic netdev watchdog TX timeouts
  [PATCH] hostap_plx: fix CIS verification
  [PATCH] ieee80211: don't flood log with errors