[XFS] Fix merge failures
[pandora-kernel.git] / drivers / net / igb / igb_ethtool.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-25 Takashi IwaiMerge branch 'topic/udev-id-rename' into to-push
2008-12-25 Takashi IwaiMerge branch 'topic/snd-hrtimer' into to-push
2008-12-25 Takashi IwaiMerge branch 'topic/jack-mechanical' into to-push
2008-12-25 Takashi IwaiMerge branch 'topic/aoa' into to-push
2008-12-24 David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-12-23 Ingo MolnarMerge branch 'x86/ptrace' into x86/tsc
2008-12-23 Ingo MolnarMerge branches 'x86/apic', 'x86/cleanups', 'x86/cpufeat...
2008-12-23 Ingo MolnarMerge commit 'v2.6.28-rc9' into x86/apic
2008-12-20 Takashi IwaiMerge branch 'topic/ca0106-spdif-stream' into topic...
2008-12-20 Takashi IwaiMerge branch 'topic/ca0106-resume' into topic/ca0106
2008-12-20 Takashi IwaiMerge branch 'topic/pcsp-fix' into topic/misc
2008-12-19 Takashi IwaiMerge branch 'fix/hda' into topic/hda
2008-12-18 Linus TorvaldsMerge branch 'fixes' of git://git./linux/kernel/git...
2008-12-18 Linus TorvaldsMerge branch 'fixes' of git://git./linux/kernel/git...
2008-12-16 David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-12-16 Ingo MolnarMerge commit 'v2.6.28-rc8' into x86/doc
2008-12-16 Ingo MolnarMerge commit 'v2.6.28-rc8' into x86/cpufeature
2008-12-16 David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-12-12 Ingo MolnarMerge commit 'v2.6.28-rc8' into x86/mm
2008-12-10 Alexander Duyckigb: Correctly determine pci-e function number in virtu...
2008-12-09 Linus TorvaldsMerge git://git.infradead.org/mtd-2.6
2008-12-08 Ingo MolnarMerge branch 'linus' into x86/quirks
2008-12-06 David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-12-04 Ingo MolnarMerge commit 'v2.6.28-rc7' into x86/cleanups
2008-12-04 Linus TorvaldsMerge branch 'for-2.6.28' of git://linux-nfs.org/~bfiel...
2008-12-03 David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-12-03 Ingo MolnarMerge commit 'v2.6.28-rc7'; branch 'x86/dumpstack'...
2008-12-03 David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-12-02 Linus TorvaldsMerge branch 'linux-next' of git://git.infradead.org...
2008-12-02 Linus TorvaldsMerge git://git./linux/kernel/git/davem/sparc-2.6
2008-12-02 Linus TorvaldsMerge git://git./linux/kernel/git/jejb/scsi-rc-fixes-2.6
2008-12-02 Linus TorvaldsMerge branch 'for_linus' of git://git./linux/kernel...
2008-12-01 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-12-01 Takashi IwaiMerge branch 'upstream' into topic/asoc
2008-12-01 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-11-30 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-11-30 Linus TorvaldsMerge branch 'linux-next' of git://git.infradead.org...
2008-11-30 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-11-28 Ingo MolnarMerge branch 'x86/debug' into x86/irq
2008-11-28 David S. MillerMerge branch 'master' of git://git./linux/kernel/git...
2008-11-28 Lachlan McIlroyMerge git://git./linux/kernel/git/torvalds/linux-2.6
2008-11-27 David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-11-26 Takashi IwaiMerge branch 'topic/misc' into topic/pcsp-fix
2008-11-25 Ingo MolnarMerge branches 'tracing/core', 'x86/urgent' and 'x86...
2008-11-25 Alexander Duyckigb: loopback bits not correctly cleared from RCTL...
2008-11-24 Ingo MolnarMerge branch 'sched/rt' into sched/core
2008-11-24 Paul MackerrasMerge branch 'merge' of git://git./linux/kernel/git...
2008-11-24 Paul MackerrasMerge branch 'merge' of ssh:///linux/kernel/git/jwboyer...
2008-11-24 Paul MackerrasMerge branch 'merge' of git://git.secretlab.ca/git...
2008-11-23 Ingo MolnarMerge branch 'oprofile-for-tip' of git://git./linux...
2008-11-23 Ingo MolnarMerge commit 'v2.6.28-rc6' into irq/urgent
2008-11-23 Ingo MolnarMerge branches 'tracing/profiling', 'tracing/options...
2008-11-23 Ingo MolnarMerge commit 'v2.6.28-rc6' into x86/debug
2008-11-22 David S. MillerMerge branch 'for-david' of git://git./linux/kernel...
2008-11-22 Alexander Duyckigb: do not use phy ops in ethtool test cleanup for...
2008-11-21 Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2008-11-21 David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-11-20 Alexander Duyckigb: Fix tx/rx_ring_count parameters for igb on suspend...
2008-11-20 Ingo MolnarMerge branch 'linus' into x86/memory-corruption-check
2008-11-20 Ingo MolnarMerge branch 'linus' into x86/uv
2008-11-20 Linus TorvaldsMerge branch 'x86/numa' of git://git./linux/kernel...
2008-11-19 Ingo MolnarMerge branches 'tracing/ftrace' and 'tracing/urgent...
2008-11-19 Ingo MolnarMerge branch 'linus' into sched/core
2008-11-19 Ingo MolnarMerge branch 'tip/urgent' of git://git./linux/kernel...
2008-11-19 David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-11-19 Paul MackerrasMerge branch 'linux-2.6' into next
2008-11-18 Ingo MolnarMerge branch 'linus' into tracing/urgent
2008-11-18 Linus TorvaldsMerge branch 'tracing-fixes-for-linus' of git://git...
2008-11-18 Linus TorvaldsMerge branch 'sched-fixes-for-linus' of git://git....
2008-11-18 Linus TorvaldsMerge branch 'core-fixes-for-linus' of git://git./linux...
2008-11-18 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-11-18 Ingo MolnarMerge branch 'iommu-fixes-2.6.28' of git://git./linux...
2008-11-18 James MorrisMerge branch 'master' into next
2008-11-18 Linus TorvaldsMerge git://git./linux/kernel/git/sfrench/cifs-2.6
2008-11-17 Linus TorvaldsMerge branch 'for-linus' of git://git.o-hand.com/linux-mfd
2008-11-17 Linus TorvaldsMerge git://git./linux/kernel/git/davem/sparc-2.6
2008-11-17 Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-11-16 \"Rafael J. Wysocki\igb: Use device_set_wakeup_enable
2008-11-13 Wang Chennetdevice: safe convert to netdev_priv() #part-2
2008-10-28 Ingo MolnarMerge commit 'v2.6.28-rc2' into x86/pci-ioapic-boot...
2008-10-20 Thomas GleixnerMerge branches 'timers/clocksource', 'timers/hrtimers...
2008-10-17 Linus TorvaldsMerge branch 'for-linus' of git://www.jni.nu/cris
2008-10-16 Dmitry TorokhovMerge branch 'next' into for-linus
2008-10-15 Ingo MolnarMerge branches 'core/softlockup', 'core/softirq', ...
2008-10-13 Linus TorvaldsMerge git://git./linux/kernel/git/brodo/pcmcia-2.6
2008-10-13 Ingo MolnarMerge branch 'linus' into oprofile-v2
2008-10-12 Ingo MolnarMerge branches 'x86/xen', 'x86/build', 'x86/microcode...
2008-10-12 Ingo MolnarMerge branch 'linus' into x86/xsave
2008-10-11 Ingo MolnarMerge branch 'x86/apic' into x86-v28-for-linus-phase4-B
2008-10-10 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-10-10 Linus TorvaldsMerge git://git./linux/kernel/git/steve/gfs2-2.6-nmw
2008-10-10 Ingo MolnarMerge branches 'core/iommu', 'x86/amd-iommu' and 'x86...
2008-10-09 Russell KingMerge branch 'for-rmk' of git://git.marvell.com/orion
next