Merge by hand (conflicts in sr.c)
[linux-2.6] / drivers / pci / hotplug / shpchp_ctrl.c
2005-08-28  James BottomleyMerge by hand (conflicts in sr.c)
2005-08-28  James BottomleyMerge HEAD from ../scsi-misc-2.6-tmp
2005-08-28  James Bottomleyfix mismerge in ll_rw_blk.c
2005-08-23  Tony LuckPull prarit-bus-sysdata into release branch
2005-08-17  Linus TorvaldsMerge /pub/scm/linux/kernel/git/aia21/ntfs-2.6
2005-08-17  Linus TorvaldsMerge head 'release' of /linux/kernel/git/aegl/linux-2.6
2005-08-17  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2005-08-17  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davem/net-2.6
2005-08-17  Kristen Accardi[PATCH] PCI Hotplug: new contact info
2005-06-26  Jeff GarzikMerge /spare/repo/linux-2.6/
2005-06-26  Jeff GarzikMerge upstream (approx. 2.6.12-git8) into 'janitor...
2005-06-15  Tony LuckAuto merge with /home/aegl/GIT/linus
2005-06-04   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch skge
2005-06-04   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch starfire
2005-06-04   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch smc91x
2005-06-04   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch remove-drivers
2005-06-04   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch iff-running
2005-06-04   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch viro
2005-06-04   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch orinoco-hch
2005-06-04   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch ppp
2005-06-04   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch hdlc
2005-06-04   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch dm9000
2005-06-04   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch 8139too-iomap
2005-06-04   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch 8139cp
2005-06-04   <jgarzik@pretzel... Merge ... /spare/repo/linux-2.6/.git branch HEAD
2005-06-04   <jgarzik@pretzel... Merge ... /spare/repo/linux-2.6/.git branch HEAD
2005-06-02  Dave KleikampMerge with /home/shaggy/git/linus-clean/
2005-05-28   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch master
2005-05-28   <jgarzik@pretzel... Merge ... fr.zoreil.com/linux-2.6.git branch HEAD
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 ... /linux/kernel/git/torvalds/linux-2.6.git...
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  Anton AltaparmakovMerge with /usr/src/ntfs-2.6.git
2005-05-21  Linus TorvaldsMerge ... parisc-linux.org/~jejb/git/scsi-for-linus...
2005-05-19  Linus TorvaldsMerge ... /linux/kernel/git/davem/sparc-2.6.git/
2005-05-19  Steve FrenchMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2005-05-19  David WoodhouseMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2005-05-18  Linus TorvaldsMerge ... /linux/kernel/git/gregkh/driver-2.6.git/
2005-05-18  Tony LuckSync with Linus - /linux/kernel/git/torvalds/linux...
2005-05-17  Dely Sy[PATCH] PCI Hotplug: Fix echoing 1 to power file of...
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2