merge by hand (fix up qla_os.c merge error)
[linux-2.6] / drivers / net / pcmcia /
2005-06-17  James Bottomleymerge by hand (fix up qla_os.c merge error)
2005-06-11  Linus TorvaldsMerge /pub/scm/linux/kernel/git/airlied/drm-2.6
2005-06-08  Linus TorvaldsMerge ... kernel.org:/home/rmk/linux-2.6-arm
2005-06-06  Tony Luckauto merge with /home/aegl/GIT/linus
2005-06-06  Steve FrenchMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2005-06-04  Linus TorvaldsAutomatic merge of 'misc-fixes' branch from
2005-06-04   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch r8169-fix
2005-05-28  Daniel Ritz[PATCH] 3c574_cs: disable interrupts in el3_close
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2