Merge branch 'master'

2005-10-13 21:22:27 -04:00
parent 0d69ae5fb7 046d20b739
commit 59aee3c2a1
323 changed files with 8096 additions and 2327 deletions
--- a/net/ieee80211/ieee80211_tx.c
+++ b/net/ieee80211/ieee80211_tx.c
@ -187,7 +187,7 @@ void ieee80211_txb_free(struct ieee80211_txb *txb)
 }

 static struct ieee80211_txb *ieee80211_alloc_txb(int nr_frags, int txb_size,
-						 unsigned int __nocast gfp_mask)
+						 gfp_t gfp_mask)
 {
 	struct ieee80211_txb *txb;
 	int i;