[XFS] Fix merge failures
[pandora-kernel.git] / drivers / net / mace.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-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-1
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-11-04 David S. Millerdrivers/net: Kill now superfluous ->last_rx stores.
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-02-07 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-02-07 Len BrownMerge branches 'release', 'misc' and 'misc-2.6.25'...
2008-02-07 Len BrownMerge branches 'release' and 'ppc-workaround' into...
2008-02-07 Len BrownMerge branches 'release' and 'hp-cid' into release
2008-02-07 Len BrownMerge branches 'release' and 'gpe-ack' into release
2008-02-07 Len BrownMerge branches 'release', 'cpuidle-2.6.25' and 'idle...
2008-02-07 Len BrownMerge branches 'release', 'bugzilla-6217', 'bugzilla...
2008-02-07 Len BrownMerge branches 'release' and 'autoload' into release
2008-02-07 Len BrownMerge branches 'release', 'asus', 'sony-laptop' and...
2008-02-07 Len BrownMerge branches 'release', 'acpi_pm_device_sleep_state...
2008-02-06 Linus TorvaldsMerge branch 'dmapool' of git://git./linux/kernel/git...
2008-02-03 David WoodhouseMerge git://git.infradead.org/~dedekind/ubi-2.6
2008-02-03 David WoodhouseMerge git://git.infradead.org/~kmpark/onenand-mtd-2.6
2008-02-03 David WoodhouseMerge git://git./linux/kernel/git/torvalds/linux-2...
2008-02-01 Linus TorvaldsMerge branch 'task_killable' of git://git./linux/kernel...
2008-01-31 Paul MackerrasMerge branch 'linux-2.6'
2008-01-30 Linus TorvaldsMerge git://git./linux/kernel/git/gregkh/driver-2.6
2008-01-29 Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6.25
2008-01-28 Al ViroNULL noise in drivers/net
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[NET] drivers/net: statistics cleanup #1 -- save memory...
2007-10-10 Ralf Baechle[NET]: Nuke SET_MODULE_OWNER macro.
2007-07-22 Len BrownPull battery into release branch
2007-07-05 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-06-13 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-06-05 Linus TorvaldsMerge git://git.infradead.org/mtd-2.6
2007-06-04 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-05-23 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-05-11 Wim Van SebroeckMerge /pub/scm/linux/kernel/git/torvalds/linux-2.6
2007-05-10 Linus TorvaldsMerge /linux/kernel/git/wim/linux-2.6-watchdog
2007-05-10 Linus TorvaldsMerge branch 'juju' of git://git./linux/kernel/git...
2007-05-10 Len BrownPull thermal into release branch
2007-05-09 Jeff GarzikMerge branch 'upstream' of git://git./linux/kernel...
2007-05-09 Linus TorvaldsMerge git://git./linux/kernel/git/aegl/linux-2.6
2007-05-09 Linus TorvaldsMerge git://git.infradead.org/mtd-2.6
2007-05-09 Linus TorvaldsMerge branch 'for-linus' of /home/rmk/linux-2.6-arm
2007-05-09 Russell KingMerge branches 'armv7', 'at91', 'misc' and 'omap' into...
2007-05-09 Linus TorvaldsMerge /pub/scm/linux/kernel/git/herbert/crypto-2.6
2007-05-09 Linus TorvaldsMerge /pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
2007-05-08 Linus TorvaldsMerge branch 'hwmon-for-linus' of git://jdelvare.pck...
2007-05-08 Linus TorvaldsMerge git://oss.sgi.com:8090/xfs/xfs-2.6
2007-05-08 Linus TorvaldsMerge branch 'reset-seq' of /linux/kernel/git/jgarzik...
2007-05-08 Linus TorvaldsMerge branch 'upstream-linus' of /linux/kernel/git...
2007-05-08 Linus TorvaldsMerge branch 'drm-patches' of /linux/kernel/git/airlied...
2007-05-08 Linus TorvaldsMerge /pub/scm/linux/kernel/git/dtor/input
2007-05-08 Linus TorvaldsMerge branch 'master' of git://git./linux/kernel/git...
2007-05-08 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-05-08 Paul MackerrasMerge branch 'linux-2.6'
2007-05-07 Linus TorvaldsMerge branch 'server-cluster-locking-api' of git:/...
2007-05-07 Linus TorvaldsMerge branch 'drm-patches' of /linux/kernel/git/airlied...
2007-05-06 Linus TorvaldsMerge branch 'for-linus' of /home/rmk/linux-2.6-arm
2007-05-05 Linus TorvaldsMerge git://git./linux/kernel/git/sfrench/cifs-2.6
next