merge by hand (fix up qla_os.c merge error)
[linux-2.6] / arch / um / kernel / uml.lds.S
2005-06-01  Linus TorvaldsMerge ... /linux/kernel/git/sfrench/cifs-2.6
2005-05-31  Steve FrenchMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2005-05-31  Linus TorvaldsMerge ... /pub/scm/linux/kernel/git/aegl/linux-2.6
2005-05-27  Christoph HellwigMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2005-05-27   <jgarzik@pretzel... Merge ... /linux/kernel/git/torvalds/linux-2.6.git...
2005-05-26  James BottomleyAutomatic merge of ../scsi-misc-2.6-old/
2005-05-26   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch tlan
2005-05-26   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch sis900
2005-05-26   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch veth
2005-05-26   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch qeth
2005-05-26   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch ns83820
2005-05-26   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch natsemi
2005-05-26   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch forcedeth
2005-05-26   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch airo
2005-05-26   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch atmel
2005-05-25   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch amd8111
2005-05-25   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch pcnet32
2005-05-25   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch ixgb
2005-05-25   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch e1000
2005-05-25   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch e100
2005-05-21  Linus TorvaldsMerge ... parisc-linux.org/~jejb/git/scsi-for-linus...
2005-05-20  Jeff Dike[PATCH] uml: small fixes left over from rc4
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2