[FORCEDETH] Fix xmit_lock/netif_tx_lock after merge
[linux-2.6] / drivers / net / via-rhine.c
2006-06-20  Linus TorvaldsMerge git://git.infradead.org/~dwmw2/rbtree-2.6
2006-06-20  Linus TorvaldsMerge git://git.infradead.org/mtd-2.6
2006-06-20  Linus TorvaldsMerge branch 'i915fb' of git://git./linux/kernel/git...
2006-06-03  Linus TorvaldsMerge /linux/kernel/git/jejb/scsi-rc-fixes-2.6
2006-05-24  David WoodhouseMerge branch 'master' of git://git./linux/kernel/git...
2006-05-22  John W. LinvilleMerge branch 'from-linus' into upstream
2006-05-22  Linus TorvaldsMerge /pub/scm/linux/kernel/git/mchehab/v4l-dvb
2006-05-20  Linus TorvaldsMerge branch 'upstream-fixes' of /linux/kernel/git...
2006-05-20  Jeff GarzikMerge branch 'upstream-fixes' into upstream
2006-05-20  Jeff GarzikMerge branch 'upstream-fixes' of git://git./linux/kerne...
2006-05-20  John W. Linville[PATCH] via-rhine: revert "change mdelay to msleep...
2006-05-11  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-serial
2006-05-11  Linus TorvaldsMerge /linux/kernel/git/jejb/scsi-rc-fixes-2.6
2006-05-08  Linus TorvaldsMerge git://git./linux/kernel/git/sam/kbuild
2006-05-06  David WoodhouseMerge git://git./linux/kernel/git/torvalds/linux-2.6
2006-05-05  John W. LinvilleMerge branch 'from-linus' into upstream
2006-05-04  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2006-05-04  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-mmc
2006-05-03  David WoodhouseMerge branch 'master' of git://git./linux/kernel/git...
2006-05-02  Jeff GarzikMerge branch 'upstream-fixes' into upstream
2006-05-02  Craig Brind[PATCH] via-rhine: zero pad short packets on Rhine...
2006-04-29  Dmitry TorokhovMerge /pub/scm/linux/kernel/git/torvalds/linux-2.6
2006-04-22  Paul MackerrasMerge branch 'misc' of /linux/kernel/git/galak/powerpc...
2006-04-18  Dave JonesMerge ../linus
2006-04-18  Linus TorvaldsMerge branch 'drm-patches' of git://git./linux/kernel...
2006-04-18  Linus TorvaldsMerge git://git./linux/kernel/git/paulus/powerpc-merge
2006-04-17  David WoodhouseMerge ... git://git./linux/kernel/git/torvalds/linux...
2006-04-15  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2006-04-15  Jeff GarzikMerge branch '7.0.38-k2' of git://66.93.40.222/srv...
2006-04-15  Linus TorvaldsMerge /pub/scm/linux/kernel/git/sam/kbuild
2006-04-14  Linus TorvaldsMerge branch 'for-linus' of /linux/kernel/git/mszeredi...
2006-04-14  Linus TorvaldsMerge branch 'tee' of git://brick.kernel.dk/data/git...
2006-04-12  Linus TorvaldsMerge branch 'for-linus' of /linux/kernel/git/roland...
2006-04-12  Linus TorvaldsMerge branch 'upstream-linus' of /linux/kernel/git...
2006-04-12  Linus TorvaldsMerge branch 'upstream-linus' of /linux/kernel/git...
2006-04-12  Jeff GarzikMerge branch 'upstream-fixes'
2006-04-12  Adrian Bunk[PATCH] drivers/net/via-rhine.c: make a function static
2006-04-12  Roger Luethi[PATCH] via-rhine: execute bounce buffers code on Rhine...
2006-04-02  Dmitry TorokhovManual merge with Linus.
2006-04-01  Paul MackerrasMerge branch 'for_paulus' of git://git./linux/kernel...
2006-04-01  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-serial
2006-04-01  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-mmc
2006-04-01  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2006-03-31  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davem/net-2.6
2006-03-31  Jeff GarzikMerge branch 'master'
2006-03-31  Steve FrenchMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2006-03-30  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2006-03-30  Linus TorvaldsMerge branch 'upstream-linus' of /linux/kernel/git...
2006-03-30  Linus TorvaldsMerge branch 'drm-patches' of git://git./linux/kernel...
2006-03-30  Linus TorvaldsMerge branch 'release' of git://git./linux/kernel/git...
2006-03-29  Jeff GarzikMerge branch 'upstream' of git://git./linux/kernel...
2006-03-29  Roger Luethi[PATCH] via-rhine: link state fix
2005-12-06  Len BrownPull release into acpica branch
2005-11-21  David S. MillerMerge git://git.skbuff.net/gitroot/yoshfuji/linux-2...
2005-11-11  Jeff GarzikMerge branch 'atmel'
2005-11-07  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/cpufreq
2005-11-07  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/agpgart
2005-11-06  Thomas GleixnerMerge branch 'master' of /home/tglx/work/mtd/git/linux...
2005-11-02  Linus TorvaldsMerge /pub/scm/linux/kernel/git/airlied/drm-2.6
2005-10-31  Tony Luckmanual update from upstream:
2005-10-31  Steve FrenchMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2005-10-31  Paul MackerrasMerge ../linux-2.6 by hand
2005-10-30  Anton AltaparmakovMerge branch 'master' of /usr/src/ntfs-2.6/
2005-10-29  Linus TorvaldsMerge branch 'release' of git://git./linux/kernel/git...
2005-10-29  Arnaldo Carvalho... Merge /pub/scm/linux/kernel/git/sridhar/lksctp-2.6
2005-10-28  Roland DreierMerge /pub/scm/linux/kernel/git/torvalds/linux-2.6
2005-10-28  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2005-10-28  Arnaldo Carvalho... Merge /linux/kernel/git/holtmann/bluetooth-2.6
2005-10-28  Greg KHMerge ../bleed-2.6
2005-10-28  Linus TorvaldsMerge branch 'forlinus' of git://parisc-linux.org/home...
2005-10-28  James BottomleyMerge HEAD from ../scsi-misc-2.6-old
2005-10-28  Jeff GarzikMerge branch 'master'
2005-10-28  Jeff GarzikMerge branch 'master'
2005-10-28  Jeff GarzikMerge branch 'master'
2005-10-28  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-mmc
2005-10-28  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2005-10-28  Jeff GarzikMerge branch 'master'
2005-10-28  Linus TorvaldsMerge branch 'sx8' of /linux/kernel/git/jgarzik/misc-2.6
2005-10-28  Linus TorvaldsMerge branch 'upstream' of /linux/kernel/git/jgarzik...
2005-10-28  Linus TorvaldsMerge branch 'upstream' of /linux/kernel/git/jgarzik...
2005-10-28  Jeff GarzikMerge branch 'master'
2005-10-26  Jeff GarzikMerge branch 'master'
2005-10-20  Jeff GarzikMerge branch 'master'
2005-10-19  John W. Linville[PATCH] via-rhine: change mdelay to msleep and remove...
2005-10-18  Jeff GarzikMerge branch 'master'
2005-10-14  Jeff GarzikMerge branch 'master'
2005-10-05  Jeff GarzikMerge branch 'master'
2005-10-04  Jeff GarzikMerge branch 'upstream-fixes'
2005-10-04  Jeff GarzikMerge branch 'upstream-fixes'
2005-09-22  Jeff GarzikMerge /spare/repo/linux-2.6/
2005-09-22  Jeff GarzikMerge /spare/repo/linux-2.6/
2005-09-14  John W. Linville[PATCH] via-rhine: support ETHTOOL_GPERMADDR
2005-09-08  Linus TorvaldsMerge kernel.org:/home/rmk/linux-2.6-i2c manually
2005-08-29  Jeff GarzikMerge /spare/repo/linux-2.6/
2005-08-29  Jeff Garzik/spare/repo/libata-dev branch 'v2.6.13'
2005-08-28  James Bottomleyfix mismerge in ll_rw_blk.c
2005-08-18  Dave JonesMerge /pub/scm/linux/kernel/git/torvalds/linux-2.6
2005-08-15  Len BrownMerge 'acpi-2.6.12' branch into to-akpm
2005-08-15  Len BrownMerge ../to-linus-stable/
2005-08-11  Len BrownMerge acpi-2.6.12 to-akpm
next