[XFS] Fix merge failures
[pandora-kernel.git] / drivers / net / ne2k-pci.c
2008-12-29 Lachlan McIlroy[XFS] Fix merge failures
2008-12-29 Linus TorvaldsMerge branch 'next' of git://git./linux/kernel/git...
2008-12-28 Linus TorvaldsMerge git://git./linux/kernel/git/sam/kbuild-next
2008-12-28 Linus TorvaldsMerge git://git./linux/kernel/git/wim/linux-2.6-nvram
2008-12-28 James MorrisMerge branch 'next' into for-linus
2008-12-28 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-12-28 Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-next-2.6
2008-12-24 David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-12-16 David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-12-16 David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-12-06 David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-12-03 David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-12-03 David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-11-28 David S. MillerMerge branch 'master' of git://git./linux/kernel/git...
2008-11-27 David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-11-22 David S. MillerMerge branch 'for-david' of git://git./linux/kernel...
2008-11-22 Stephen Hemmingerne2k: convert to net_device_ops
2008-11-21 David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-11-19 David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-11-13 Wang Chennetdevice: safe convert to netdev_priv() #part-2
2008-11-11 David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-11-07 David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-10-31 David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-10-28 Johannes Bergnet: convert print_mac to %pM
2008-05-01 Mark M. HoffmanMerge branch 'smsc47b397-new-id' into release
2008-04-30 Len BrownMerge branches 'release', 'acpica', 'bugzilla-10224...
2008-04-24 Trond MyklebustMerge branch 'devel'
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-20 Haavard SkinnemoenMerge branch 'master' of git://git./linux/kernel/git...
2008-04-18 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-04-17 Tony LuckPull regset into release branch
2008-04-17 Tony LuckPull virt-cpu-accounting into release branch
2008-04-17 Tony LuckPull fsys_gettimeofday into release branch
2008-04-01 Dmitry TorokhovMerge /linux/kernel/git/torvalds/linux-2.6 into for...
2008-03-27 Linus TorvaldsMerge branch 'avr32-fixes' of git://git./linux/kernel...
2008-03-27 Len BrownMerge branches 'release', 'idle', 'redhat-bugzilla...
2008-03-27 Linus TorvaldsMerge git://git./linux/kernel/git/davem/sparc-2.6
2008-03-25 Paul MackerrasMerge branch 'linux-2.6'
2008-03-25 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-03-24 Linus TorvaldsMerge git://git./linux/kernel/git/davem/sparc-2.6
2008-03-23 David S. MillerMerge branch 'upstream-net26' of /linux/kernel/git...
2008-03-23 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-03-23 Linus TorvaldsMerge git://git./linux/kernel/git/sfrench/cifs-2.6
2008-03-21 Linus TorvaldsMerge git://git./linux/kernel/git/davem/sparc-2.6
2008-03-21 Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-03-18 David S. MillerMerge branch 'master' of git://git./linux/kernel/git...
2008-03-18 David S. MillerMerge branch 'master' of git://git./linux/kernel/git...
2008-03-17 David S. MillerMerge branch 'master' of git://git./linux/kernel/git...
2008-03-17 Al Viromore misannotations: ne2k-pci
2007-11-20 Len BrownPull cpuidle into release branch
2007-10-29 Len BrownPull cpuidle into release branch
2007-10-23 Linus TorvaldsMerge git://git.infradead.org/battery-2.6
2007-10-19 Linus TorvaldsMerge branch 'release' of git://git./linux/kernel/git...
2007-10-19 Linus TorvaldsMerge git://git./linux/kernel/git/sfrench/cifs-2.6
2007-10-17 Linus TorvaldsMerge branch 'for-linus' of git://oss.sgi.com:8090...
2007-10-15 Linus TorvaldsMerge branch 'locks' of git://linux-nfs.org/~bfields...
2007-10-15 Linus TorvaldsMerge git://git.linux-nfs.org/pub/linux/nfs-2.6
2007-10-15 Linus TorvaldsMerge /pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
2007-10-15 Linus TorvaldsMerge branch 'nfs-server-stable' of git://linux-nfs...
2007-10-14 Linus TorvaldsMerge branch 'release' of git://lm-sensors.org/kernel...
2007-10-14 David WoodhouseMerge branch 'master' of git://git.infradead.org/~dedek...
2007-10-13 Linus TorvaldsMerge git://git./linux/kernel/git/lethal/sh64-2.6
2007-10-13 Linus TorvaldsMerge git://git./linux/kernel/git/lethal/sh-2.6
2007-10-13 David WoodhouseMerge branch 'master' of git://git./linux/kernel/git...
2007-10-13 Dmitry TorokhovMerge /pub/scm/linux/kernel/git/torvalds/linux-2.6
2007-10-12 Russell KingMerge branches 'omap1-upstream' and 'omap2-upstream...
2007-10-12 Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/cpufreq
2007-10-12 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-10-12 Linus TorvaldsMerge git://git./linux/kernel/git/steve/gfs2-2.6-nmw
2007-10-12 Linus TorvaldsMerge branch 'master' of git://git./linux/kernel/git...
2007-10-12 Linus TorvaldsMerge branch 'upstream-fixes' of /linux/kernel/git...
2007-10-12 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-10-12 Linus TorvaldsMerge branch 'master' of git://git./linux/kernel/git...
2007-10-10 Joe Perches[NET]: Introduce and use print_mac() and DECLARE_MAC_BUF()
2007-10-10 Jeff Garzik[ETHTOOL] Provide default behaviors for a few ethtool...
2007-10-10 Denis Chengdrivers/net/: all drivers/net/ cleanup with ARRAY_SIZE
2007-10-10 Ralf Baechle[NET]: Nuke SET_MODULE_OWNER macro.
2007-09-25 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-09-12 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-08-31 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-08-25 Linus TorvaldsMerge branch 'drm-patches' of git://git./linux/kernel...
2007-08-18 Linus TorvaldsMerge git://git./linux/kernel/git/sfrench/cifs-2.6
2007-08-12 Len BrownPull bugzilla-3774 into release branch
2007-08-07 Jeff GarzikMerge branch 'r8169-for-jeff-20070806' of git://electri...
2007-08-07 Linus TorvaldsMerge /linux/kernel/git/jejb/scsi-rc-fixes-2.6
2007-08-03 Linus TorvaldsMerge git://git.infradead.org/battery-2.6
2007-08-02 Linus TorvaldsMerge branch 'release' of git://git./linux/kernel/git...
2007-08-01 David WoodhouseMerge branch 'master' of git://git./linux/kernel/git...
2007-08-01 Linus TorvaldsMerge git://git./linux/kernel/git/wim/linux-2.6-watchdog
2007-08-01 Linus TorvaldsMerge branch 'upstream' of git://ftp.linux-mips.org...
2007-08-01 Linus TorvaldsMerge branch 'release' of git://lm-sensors.org/kernel...
2007-07-31 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-07-31 Linus TorvaldsMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2007-07-31 Matthew Wilcox[NET]: ethtool_perm_addr only has one implementation
2007-07-23 David WoodhouseMerge branch 'master' of git://git./linux/kernel/git...
2007-07-22 Linus TorvaldsMerge branch 'for-linus' of git://git.o-hand.com/linux...
2007-07-22 Linus TorvaldsMerge branch 'for-linus' of git://git.o-hand.com/linux...
2007-07-22 Len BrownPull netlink into release branch
2007-07-22 Len BrownPull osi into release branch
next