[XFS] Fix merge failures
[pandora-kernel.git] / drivers / net / mlx4 / en_tx.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-26 Yevgeny Petrilinmlx4_en: Removed redundant cq->armed flag
2008-12-26 Yevgeny Petrilinmlx4_en: Removed TX locking when polling TX cq
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-23 Ingo MolnarMerge branches 'x86/apic', 'x86/cleanups', 'x86/cpufeat...
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-12 Ingo MolnarMerge commit 'v2.6.28-rc8' into x86/mm
2008-12-09 Linus TorvaldsMerge git://git.infradead.org/mtd-2.6
2008-12-03 Ingo MolnarMerge commit 'v2.6.28-rc7'; branch 'x86/dumpstack'...
2008-11-30 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-11-26 Takashi IwaiMerge branch 'topic/misc' into topic/pcsp-fix
2008-11-25 Takashi IwaiMerge branch 'topic/fix/hda' into for-linus
2008-11-24 Paul MackerrasMerge branch 'merge' of git://git./linux/kernel/git...
2008-11-21 Takashi IwaiMerge branches 'topic/fix/hda' and 'topic/fix/sound...
2008-11-18 Takashi IwaiMerge branches 'topic/fix/hda' and 'topic/fix/misc...
2008-11-12 Takashi IwaiMerge branch 'topic/fix/hda' into for-linus
2008-11-10 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-11-06 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-11-06 Linus TorvaldsMerge git://git.infradead.org/mtd-2.6
2008-11-06 Ingo MolnarMerge branch 'iommu-fixes-2.6.28' of git://git./linux...
2008-11-05 James MorrisMerge branch 'master' into next
2008-11-03 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-11-02 Linus TorvaldsMerge git://git./linux/kernel/git/davem/sparc-2.6
2008-10-31 Takashi IwaiMerge commit 'v2.6.28-rc2' into topic/asoc
2008-10-31 Linus TorvaldsMerge git://git./linux/kernel/git/davem/sparc-2.6
2008-10-30 Linus TorvaldsMerge git://git./linux/kernel/git/brodo/pcmcia-2.6
2008-10-30 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-10-29 Jesper NilssonMerge branch 'for-next' of git://jni.nu/cris into cris_...
2008-10-28 Linus TorvaldsMerge branch 'irq-fixes-for-linus' of git://git./linux...
2008-10-28 Ingo MolnarMerge commit 'v2.6.28-rc2' into x86/doc
2008-10-28 Ingo MolnarMerge commit 'v2.6.28-rc2' into x86/pci-ioapic-boot...
2008-10-28 Paul MundtMerge branches 'sh/serial-rework' and 'sh/oprofile'
2008-10-27 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-10-27 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-10-27 Ingo MolnarMerge commit 'v2.6.28-rc2' into x86/uv
2008-10-27 Ingo MolnarMerge commit 'v2.6.28-rc2' into tracing/urgent
2008-10-26 Linus TorvaldsMerge branch 'for-linus' of git://neil.brown.name/md
2008-10-26 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-10-26 Linus TorvaldsMerge branch 'for-upstream' of git://git./linux/kernel...
2008-10-26 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-10-25 Len BrownMerge branch 'i7300_idle' into release
2008-10-24 Ingo MolnarMerge commit 'v2.6.28-rc1' into sched/urgent
2008-10-24 Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-10-24 Linus TorvaldsMerge git://git./linux/kernel/git/davem/sparc-2.6
2008-10-23 Linus TorvaldsMerge branch 'for-linus' of git://git.o-hand.com/linux...
2008-10-23 Linus TorvaldsMerge branch 'for-linus' of /home/rmk/linux-2.6-arm
2008-10-23 Linus TorvaldsMerge branch 'for-linus' of git://git.o-hand.com/linux...
2008-10-23 Linus TorvaldsMerge git://git./linux/kernel/git/jejb/scsi-misc-2.6
2008-10-23 Linus TorvaldsMerge branch 'x86-fixes-for-linus' of git://git./linux...
2008-10-23 Linus TorvaldsMerge branch 'proc' of git://git./linux/kernel/git...
2008-10-23 Linus TorvaldsMerge branch 'v28-range-hrtimers-for-linus-v2' of git...
2008-10-23 Linus TorvaldsMerge git://git./linux/kernel/git/sfrench/cifs-2.6
2008-10-23 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-10-23 Linus TorvaldsMerge git://git./linux/kernel/git/hskinnemoen/avr32-2.6
2008-10-23 Linus TorvaldsMerge git://git./linux/kernel/git/viro/bdev
2008-10-23 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-10-23 Linus TorvaldsMerge branch 'x86/um-header' of git://git./linux/kernel...
2008-10-23 Linus TorvaldsMerge branch 'release' of git://git./linux/kernel/git...
2008-10-23 Linus TorvaldsMerge git://git./linux/kernel/git/lethal/sh-2.6
2008-10-23 Linus TorvaldsMerge branch 'drm-next' of git://git./linux/kernel...
2008-10-23 Linus TorvaldsMerge branch 'linux-next' of git://git./linux/kernel...
2008-10-23 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-10-23 Linus TorvaldsMerge branch 'for-2.6.28' of git://linux-nfs.org/~bfiel...
2008-10-23 Linus TorvaldsMerge branch 'i2c-for-linus' of git://jdelvare.pck...
2008-10-23 Linus TorvaldsMerge git://git./linux/kernel/git/gregkh/usb-2.6
2008-10-23 Linus TorvaldsMerge git://git./linux/kernel/git/gregkh/staging-2.6
2008-10-23 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-10-23 Linus TorvaldsMerge git://git./linux/kernel/git/rusty/linux-2.6-for...
2008-10-23 Linus TorvaldsMerge branch 'for_linus' of git://git./linux/kernel...
2008-10-23 Linus TorvaldsMerge branch 'v28-timers-for-linus' of git://git./linux...
2008-10-23 Linus TorvaldsMerge git://git.infradead.org/iommu-2.6
2008-10-23 Linus TorvaldsMerge git://git./linux/kernel/git/bart/ide-2.6
2008-10-23 Linus TorvaldsMerge git://git./linux/kernel/git/agk/linux-2.6-dm
2008-10-23 Linus TorvaldsMerge branch 'core-fixes-for-linus' of git://git./linux...
2008-10-23 Linus TorvaldsMerge branch 'sched-fixes-for-linus' of git://git....
2008-10-23 Linus TorvaldsMerge branch 'irq-fixes-for-linus' of git://git./linux...
2008-10-23 Linus TorvaldsMerge git://git./linux/kernel/git/czankel/xtensa-2.6
2008-10-23 Linus TorvaldsMerge git://git./linux/kernel/git/benh/powerpc
2008-10-23 Linus TorvaldsMerge branch 'for-upstream' of git://git./linux/kernel...
2008-10-23 Linus TorvaldsMerge branch 'for-next' of git://git.o-hand.com/linux-mfd
2008-10-23 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-10-22 Roland DreierMerge branches 'cma', 'cxgb3', 'ehca', 'ipoib', 'mad...
2008-10-22 Yevgeny Petrilinmlx4_en: Add driver for Mellanox ConnectX 10GbE NIC