Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

This commit is contained in:
Roland Dreier
2005-10-28 15:50:51 -07:00
1055 changed files with 36394 additions and 19510 deletions

View File

@ -525,7 +525,7 @@ void mthca_cmd_use_polling(struct mthca_dev *dev)
}
struct mthca_mailbox *mthca_alloc_mailbox(struct mthca_dev *dev,
unsigned int gfp_mask)
gfp_t gfp_mask)
{
struct mthca_mailbox *mailbox;