Manual merge of for-linus to upstream (fix conflicts in drivers/infiniband/core/ucm.c)
[linux-2.6] / include / net / tc_act /
2005-05-20  James Bottomleymerge by hand - fix up rejections in Documentation...
2005-05-06  Linus TorvaldsMerge ... parisc-linux.org/~jejb/git/scsi-for-linus...
2005-04-26  Linus TorvaldsMerge ... kernel.org:/home/rmk/linux-2.6-rmk.git
2005-04-26  Linus TorvaldsMerge ... /linux/kernel/git/gregkh/usb-2.6.git/
2005-04-25  Linus TorvaldsAutomated merge of /home/rmk/linux-2.6-rmk.git
2005-04-25  Linus TorvaldsMerge ... /linux/kernel/git/davem/sparc-2.6.git
2005-04-25  Jamal Hadi Salim[PKT_SCHED]: Introduce simple actions.
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2