merge by hand (fix up qla_os.c merge error)
[linux-2.6] / arch / um / drivers / mmapper_kern.c
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-09  Steve FrenchMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2005-06-08  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davem/net-2.6
2005-06-08  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davem/tg3-2.6
2005-06-08  Jeff Dike[PATCH] uml: make the emulated iomem driver work on 2.6
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2