[XFS] Fix merge failures
[pandora-kernel.git] / drivers / net / 8390.c
2008-05-03 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-05-03 Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-05-01 David S. MillerMerge branch 'master' of /linux/kernel/git/linville...
2008-05-01 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-05-01 Linus TorvaldsMerge branch 'release' of git://lm-sensors.org/kernel...
2008-05-01 Harvey Harrisonnet: fix returning void-valued expression warnings
2008-04-30 Len BrownMerge branches 'release', 'acpica', 'bugzilla-10224...
2008-04-30 Paul MackerrasMerge git://git./pub/scm/linux/kernel/git/jk/spufs
2008-04-29 Russell KingMerge branches 'pxa' and 'orion-fixes1'
2008-04-29 Jeff GarzikMerge branch 'upstream-jeff' of git://git./linux/kernel...
2008-04-27 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-04-25 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-04-25 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-04-24 Trond MyklebustMerge branch 'devel'
2008-04-24 Steve FrenchMerge branch 'master' of /linux/kernel/git/torvalds...
2008-04-24 Paul MackerrasMerge branch 'powerpc-next' of /linux/kernel/git/galak...
2008-04-23 David WoodhouseMerge git://git.infradead.org/~dedekind/ubi-2.6
2008-04-22 Linus TorvaldsMerge branch 'for_linus' of git://git./linux/kernel...
2008-04-22 David WoodhouseMerge branch 'master' of git://git./linux/kernel/git...
2008-04-22 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-04-21 Linus TorvaldsMerge branch 'master' of git://git./linux/kernel/git...
2008-04-21 Linus TorvaldsMerge git://git./linux/kernel/git/lethal/sh-2.6
2008-04-20 Haavard SkinnemoenMerge branch 'master' of git://git./linux/kernel/git...
2008-04-20 Haavard SkinnemoenMerge branch 'master' of git://git./linux/kernel/git...
2008-04-19 Russell KingMerge branch 'merge-fixes' into devel
2008-04-19 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-04-19 Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6.26
2008-04-18 David S. MillerMerge branch 'master' of /linux/kernel/git/torvalds...
2008-04-14 David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-04-03 David S. MillerMerge branch 'master' of git://git./linux/kernel/git...
2008-04-03 David S. MillerMerge branch 'master' of git://git./linux/kernel/git...
2008-03-28 David S. MillerMerge branch 'master' of git://git./linux/kernel/git...
2008-03-24 David S. MillerMerge branch 'master' of ../net-2.6/
2008-03-23 David S. Miller[8390]: Fix build error.
2008-03-23 David S. MillerMerge branch 'upstream-net26' of /linux/kernel/git...
2008-03-17 Jon Schindler/drivers/net/8390.c replaced init_module&cleanup_module...
2007-02-03 Len BrownPull video into test branch
2007-01-17 David WoodhouseMerge branch 'master' of git://git./linux/kernel/git...
2006-12-20 Len BrownPull bugfix into test branch
2006-12-20 Len BrownPull platform-drivers into test branch
2006-12-16 Len BrownPull style into test branch
2006-12-16 Len BrownPull bugfix into test branch
2006-12-16 Len BrownPull trivial into test branch
2006-12-16 Len BrownPull platform-drivers into test branch
2006-12-16 Len BrownPull button into test branch
2006-12-13 Russell King[ARM] Merge AT91 and devel branches
2006-12-12 Dave JonesMerge ../linus
2006-12-12 Dave JonesMerge ../linus
2006-12-08 Dmitry TorokhovMerge /pub/scm/linux/kernel/git/torvalds/linux-2.6
2006-12-07 Linus TorvaldsMerge branch 'for-linus' of /home/rmk/linux-2.6-arm
2006-12-07 Linus TorvaldsMerge /pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw
2006-12-06 Linus TorvaldsMerge /pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
2006-12-05 David HowellsMerge branch 'master' of git://git./linux/kernel/git...
2006-12-05 Linus TorvaldsMerge branch 'upstream-linus' of git://git./linux/kerne...
2006-12-04 Linus TorvaldsMerge branch 'upstream-linus' of /linux/kernel/git...
2006-12-04 Paul MackerrasMerge branch 'linux-2.6' into for-linus
2006-12-02 Linus TorvaldsMerge branch 'upstream-linus' of /linux/kernel/git...
2006-12-02 Al Viro[PATCH] beginning of 8390 fixes - generic and arm/etherh
2006-11-30 Wim Van SebroeckMerge ../linux-2.6-watchdog-mm
2006-10-23 Linus TorvaldsMerge git://git./linux/kernel/git/wim/linux-2.6-watchdog
2006-10-22 David WoodhouseMerge git://git.infradead.org/~dwmw2/cafe-2.6
2006-10-21 Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/agpgart
2006-10-21 Jeff GarzikMerge tag 'jg-20061012-00' of git://electric-eye.fr...
2006-10-21 David WoodhouseMerge branch 'master' of git://git./linux/kernel/git...
2006-10-13 Linus TorvaldsMerge git://git./linux/kernel/git/sfrench/cifs-2.6
2006-10-12 Linus TorvaldsMerge /pub/scm/linux/kernel/git/lethal/sh-2.6
2006-10-11 Jeff GarzikMerge branch 'master' into upstream-fixes
2006-10-11 Jeff GarzikMerge branch 'master' into upstream-fixes
2006-10-09 Linus TorvaldsMerge git://git.infradead.org/~dhowells/irq-2.6
2006-10-09 Linus TorvaldsMerge branch 'irqclean-submit1' of /linux/kernel/git...
2006-10-08 Linus TorvaldsMerge branch 'upstream-linus' of git://git./linux/kerne...
2006-10-06 Jeff GarzikMerge branch 'submit1' of viper:/spare/repo/irq-remove...
2006-10-06 Jeff Garzikdrivers/net: eliminate irq handler impossible checks...
2006-10-06 Jeff GarzikMerge branch 'master' into upstream-fixes
2006-10-05 Linus TorvaldsMerge git://git.infradead.org/~dhowells/irq-2.6
2006-10-05 David HowellsIRQ: Maintain regs pointer globally rather than passing...
2006-10-05 Linus TorvaldsMerge /pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
2006-10-04 Paul MackerrasMerge branch 'upstream' of git://git./linux/kernel...
2006-10-04 Paul MackerrasMerge branch 'master' of git://oak/home/sfr/kernels...
2006-10-03 Linus TorvaldsMerge branch 'devel' of /home/rmk/linux-2.6-arm
2006-10-03 Linus TorvaldsMerge git://git./linux/kernel/git/paulus/powerpc
2006-10-02 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2006-10-02 Steven WhitehouseMerge branch 'master' into gfs2
2006-10-01 David WoodhouseMerge branch 'master' of git://git./linux/kernel/git...
2006-10-01 Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/agpgart
2006-10-01 Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/cpufreq
2006-10-01 Jeff GarzikMerge branch 'master' into upstream
2006-10-01 Jeff GarzikMerge branch 'master' into upstream
2006-09-30 Linus TorvaldsMerge branch 'drm-patches' of git://git./linux/kernel...
2006-09-30 Linus TorvaldsMerge /pub/scm/linux/kernel/git/mchehab/v4l-dvb
2006-09-30 Linus TorvaldsMerge branch 'upstream-linus' of git://git./linux/kerne...
2006-09-30 Linus TorvaldsMerge branch 'intelfb-patches' of /linux/kernel/git...
2006-09-29 Linus TorvaldsMerge branch 'for-linus' of /linux/kernel/git/roland...
2006-09-29 Linus TorvaldsMerge git://oss.sgi.com:8090/xfs/xfs-2.6
2006-09-29 Arjan van de Ven[PATCH] lockdep: core, add enable/disable_irq_irqsave...
2006-09-28 Linus TorvaldsMerge branch 'devel' of /home/rmk/linux-2.6-mmc
2006-09-28 Russell KingMerge nommu branch
2006-09-27 Paul MackerrasMerge branch 'upstream' of git://git./linux/kernel...
2006-09-27 Russell KingMerge /linux/kernel/git/tmlind/linux-omap-upstream...
2006-09-27 Linus TorvaldsMerge branch 'release' of git://git./linux/kernel/git...
next