John W. Linville wrote:
This request is in addition to the request from 2/17, which does not
yet seem to be in the 'upstream' branch of netdev-2.6.
---
The following changes since commit acfaf10be5c19f7dceb9d7372039dc45af66b100:
John W. Linville:
Merge branch 'upstream-fixes'
are found in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git
upstream
Dan Williams:
wireless/airo: Remove 'Setting transmit key' info messages
Pete Zaitcev:
ieee80211_geo.c: remove frivolous BUG_ON's
drivers/net/wireless/airo.c | 2 --
net/ieee80211/ieee80211_geo.c | 9 ++++++---
2 files changed, 6 insertions(+), 5 deletions(-)
Pulled, but in the future:
1) _always_ include _all_ changes in your pull request. Do not make it
cumulative to previous emails. Your email should reflect the current
state of 'upstream..upstream-linville'
2) Don't include non-wireless stuff. Notably, pulling your repo pulled
the following non-wireless change. This was a big no-no.
drivers/net/Kconfig | 18 +++---
drivers/net/arcnet/Kconfig | 4 +
drivers/net/irda/Kconfig | 4 +
drivers/net/wan/Kconfig | 2 -
[PATCH] trivial: fix spelling errors in Kconfigs
This patch corrects a few spelling and grammar errors found in
drivers/net
Signed-off-by: Jon Mason <[EMAIL PROTECTED]>
Signed-off-by: John W. Linville <[EMAIL PROTECTED]>
I only accepted it this time because the change is OK, and because its a
big pain to back out your entire pull just for this.
Jeff
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
