[XFS] Fix merge failures
[pandora-kernel.git] / drivers / net / gianfar.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 David S. MillerMerge branch 'for-david' of git://git./linux/kernel...
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-23 Neil Hormannet: Remove unused netdev arg from some NAPI interfaces.
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-18 Andy Fleminggianfar: Continue polling until both tx and rx are...
2008-12-18 Dai Harukigianfar: Merge Tx and Rx interrupt for scheduling clean...
2008-12-18 Dai Harukigianfar: Use interface name in interrupt name to distin...
2008-12-18 Dai Harukigianfar: Add Scatter Gather support
2008-12-18 Andy Fleminggianfar: Fix packet drop when out of memory
2008-12-16 Dai Harukigianfar: Make all BD status writes 32-bit
2008-12-16 Andy Fleminggianfar: Add macros for stepping through BDs
2008-12-16 Dai Harukigianfar: Remove unused gfar_add_fcb() function parameter
2008-12-16 Dai Harukigianfar: Enable padding and Optimize the frame prepende...
2008-12-16 Dai Harukigianfar: Fix VLAN HW feature related frame/buffer size...
2008-12-16 Dai Harukigianfar: Fix eTSEC configuration procedure
2008-12-16 Dai Harukigianfar: Optimize interrupt coalescing configuration
2008-12-16 Andy Fleminggianfar: Convert gianfar to an of_platform_driver
2008-12-16 Andy Fleminggianfar: Use gfar_halt to stop DMA in gfar_probe
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-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 Takashi IwaiMerge branch 'topic/fix/hda' into for-linus
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-21 Takashi IwaiMerge branches 'topic/fix/hda' and 'topic/fix/sound...
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 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 Takashi IwaiMerge branches 'topic/fix/hda' and 'topic/fix/misc...
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 Linus TorvaldsMerge git://git./linux/kernel/git/brodo/pcmcia-2.6
2008-11-14 David S. MillerMerge branch 'davem-fixes' of /linux/kernel/git/jgarzik...
next