Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
[linux-2.6] / arch / um / drivers / slip_common.c
2005-06-18  Linus TorvaldsManual merge of /linux/kernel/git/jgarzik/netdev-2...
2005-06-18  Jeff GarzikMerge /spare/repo/linux-2.6/
2005-06-18  Russell KingMerge with ../linux-2.6-smp
2005-06-18  David WoodhouseMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2005-06-18  James Bottomleymerge by hand (qla_os.c mismerge)
2005-06-17  James Bottomleymerge by hand (fix up qla_os.c merge error)
2005-06-14  Jeff Dike[PATCH] uml: slirp and slip driver cleanups and fixes