[XFS] Fix merge failures
[pandora-kernel.git] / include / linux / etherdevice.h
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-24 Eric Dumazeteth: Declare an optimized compare_ether_addr_64bits...
2008-11-21 David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-11-20 Stephen Hemmingernetdev: expose ethernet address primitives
2008-05-01 Mark M. HoffmanMerge branch 'smsc47b397-new-id' into release
2008-04-18 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-02-29 Linus TorvaldsMerge branch 'avr32-fixes' of git://git./linux/kernel...
2008-02-26 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-02-24 Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-02-24 Linus TorvaldsMerge git://git./linux/kernel/git/davem/sparc-2.6
2008-02-24 David S. MillerMerge branch 'master' of ../linux-2.6/
2008-02-19 Linus TorvaldsMerge branch 'release' of git://git./linux/kernel/git...
2008-02-19 Linus TorvaldsMerge git://git./linux/kernel/git/davem/sparc-2.6
2008-02-19 Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-02-18 Linus TorvaldsMerge git://git./linux/kernel/git/sam/kbuild
2008-02-18 Lachlan McIlroyMerge git://git./linux/kernel/git/torvalds/linux-2...
2008-02-15 Steve FrenchMerge branch 'master' of /linux/kernel/git/torvalds...
2008-02-15 Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-02-15 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-02-15 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-02-14 Christoph LameterMerge branch 'master' of git://git./linux/kernel/git...
2008-02-14 Linus TorvaldsMerge git://git./linux/kernel/git/jejb/scsi-rc-fixes-2.6
2008-02-14 Randy Dunlapdocbook: make a networking book and fix a few errors
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 Stephen Hemminger[NET]: Move hardware header operations out of netdevice.
2007-07-23 David WoodhouseMerge branch 'master' of git://git./linux/kernel/git...
2007-07-22 Len BrownPull netlink into release branch
2007-07-22 Len BrownPull osi into release branch
2007-07-22 Len BrownPull video into release branch
2007-07-22 Len BrownPull throttle into release branch
2007-07-22 Len BrownPull misc into release branch
2007-07-22 Len BrownPull dock-bay into release branch
2007-07-22 Len BrownPull bugzilla-7880 into release branch
2007-07-22 Len BrownPull ec into release branch
2007-07-22 Len BrownPull sbs into release branch
2007-07-22 Len BrownPull battery into release branch
2007-07-22 Len BrownPull acpi-debug into release branch
2007-07-22 Len BrownPull acpica into release branch
2007-07-19 Linus TorvaldsMerge branch 'release' of git://lm-sensors.org/kernel...
2007-07-19 Steve FrenchMerge branch 'master' of /linux/kernel/git/torvalds...
2007-07-17 Linus TorvaldsMerge git://git./linux/kernel/git/wim/linux-2.6-watchdog
2007-07-17 Linus TorvaldsMerge branch 'merge' of git://git./linux/kernel/git...
2007-07-17 Linus TorvaldsMerge branch 'upstream-linus' of /linux/kernel/git...
2007-07-16 Linus TorvaldsMerge branch 'drm-patches' of ssh:///linux/kernel/git...
2007-07-16 Linus TorvaldsMerge branch 'upstream-linus' of git://git./linux/kerne...
2007-07-16 Linus TorvaldsMerge /pub/scm/linux/kernel/git/lethal/sh-2.6
2007-07-15 Linus TorvaldsMerge /pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
2007-07-15 Linus TorvaldsMerge branch 'for-linus' of git://oss.sgi.com:8090...
2007-07-15 David S. MillerMerge /pub/scm/linux/kernel/git/herbert/crypto-2.6
2007-07-13 Linus TorvaldsMerge git://git.linux-nfs.org/pub/linux/nfs-2.6
2007-07-13 Linus TorvaldsMerge branch 'ioat-md-accel-for-linus' of git://lost...
2007-07-13 Linus TorvaldsMerge git://git./linux/kernel/git/mingo/linux-2.6-sched
2007-07-12 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-07-12 Linus TorvaldsMerge branch 'devel' of /home/rmk/linux-2.6-arm
2007-07-12 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-07-12 Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/cpufreq
2007-07-12 Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/agpgart
2007-07-12 Linus TorvaldsMerge branch 'release' of git://git./linux/kernel/git...
2007-07-12 Linus TorvaldsMerge /pub/scm/linux/kernel/git/gregkh/pci-2.6
2007-07-12 Linus TorvaldsMerge /pub/scm/linux/kernel/git/gregkh/driver-2.6
2007-07-12 Linus TorvaldsMerge branch 'upstream-linus' of /linux/kernel/git...
2007-07-12 Linus TorvaldsMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2007-07-12 David S. MillerMerge /linux/kernel/git/holtmann/bluetooth-2.6
next