Merge upstream (approx. 2.6.12-git8) into 'janitor' branch of netdev-2.6.
[deliverable/linux.git] / arch / um / drivers / stdio_console.c
2005-06-26  Jeff GarzikMerge upstream (approx. 2.6.12-git8) into 'janitor...
2005-06-26  Linus TorvaldsMerge 'drm-3264' branch of /linux/kernel/git/airlied...
2005-06-26  Linus TorvaldsMerge 'drm-fixes' branch of /linux/kernel/git/airlied...
2005-06-26  Linus TorvaldsMerge Christoph's freeze cleanup patch
2005-06-25  Jeff Dike[PATCH] uml: hot-unplug code cleanup
2005-06-21  Jaroslav KyselaMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2005-06-18  Russell KingMerge with ../linux-2.6-smp
2005-06-17  James Bottomleymerge by hand (fix up qla_os.c merge error)