[XFS] Fix merge failures
[pandora-kernel.git] / drivers / net / bnx2.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-28 Linus TorvaldsMerge branch 'for-linus' 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/pcxhr-update' into to-push
2008-12-25 Takashi IwaiMerge branch 'topic/oxygen' into to-push
2008-12-25 Takashi IwaiMerge branch 'topic/jack-mechanical' into to-push
2008-12-25 Takashi IwaiMerge branch 'topic/cs5535audio' into to-push
2008-12-25 Takashi IwaiMerge branch 'topic/audigy-capture-boost' into to-push
2008-12-25 Takashi IwaiMerge branch 'topic/asoc' into to-push
2008-12-25 Takashi IwaiMerge branch 'topic/aoa' into to-push
2008-12-25 James MorrisMerge branch 'next' into for-linus
2008-12-24 David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-12-23 Ingo MolnarMerge branch 'x86/iommu' into x86/core
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-22 Lachlan McIlroy[XFS] Fix merge conflict in fs/xfs/xfs_rename.c
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/ca0106-capture-no-44khz' into topic...
2008-12-20 Takashi IwaiMerge branch 'topic/hda-resume-fix' into topic/hda
2008-12-20 Takashi IwaiMerge branch 'topic/pcsp-fix' into topic/misc
2008-12-19 Linus TorvaldsMerge git://git./linux/kernel/git/jejb/scsi-rc-fixes-2.6
2008-12-19 Takashi IwaiMerge branch 'fix/asoc' into for-linus
2008-12-19 Ingo MolnarMerge branches 'tracing/ftrace', 'tracing/ring-buffer...
2008-12-19 Takashi IwaiMerge branch 'topic/hda-doc' into topic/hda
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 Linus TorvaldsMerge git://git./linux/kernel/git/davem/sparc-2.6
2008-12-17 David S. Millerbnx2: Don't redefine FLOW_CTRL_{RX,TX}.
2008-12-17 Michael Chanbnx2: Rename MSI-X vectors.
2008-12-17 Paul MackerrasMerge branch 'next' of /linux/kernel/git/jwboyer/powerp...
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/uv
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-16 Paul MackerrasMerge branch 'merge' into next
2008-12-15 Linus TorvaldsMerge branch 'merge' of git://git./linux/kernel/git...
2008-12-13 Linus TorvaldsMerge branch 'merge' of git://git./linux/kernel/git...
2008-12-12 Ingo MolnarMerge commit 'v2.6.28-rc8' into x86/irq
2008-12-12 Ingo MolnarMerge commit 'v2.6.28-rc8' into x86/mm
2008-12-12 Ingo MolnarMerge commit 'v2.6.28-rc8' into sched/core
2008-12-10 Linus TorvaldsMerge branch 'sched-fixes-for-linus' of git://git....
2008-12-10 Linus TorvaldsMerge branch 'upstream' of git://ftp.linux-mips.org...
2008-12-09 Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2008-12-09 Linus TorvaldsMerge git://git.infradead.org/mtd-2.6
2008-12-09 Linus TorvaldsMerge branch 'audit.b59' of git://git./linux/kernel...
2008-12-09 Linus TorvaldsMerge branch 'drm-fixes' of git://git./linux/kernel...
2008-12-09 Linus TorvaldsMerge branch 'merge' of git://git./linux/kernel/git...
2008-12-09 Linus TorvaldsMerge git://git./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 Michael Chanbnx2: Add workaround to handle missed MSI.
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-30 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-11-28 Ilpo Järvinenbnx2: use net_device_stats nowadays available in net_device
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-26 Takashi IwaiMerge branch 'topic/misc' into topic/pcsp-fix
2008-11-25 Takashi IwaiMerge branch 'topic/fix/hda' into for-linus
2008-11-21 Takashi IwaiMerge branches 'topic/fix/hda' and 'topic/fix/sound...
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-18 Takashi IwaiMerge branches 'topic/fix/hda' and 'topic/fix/misc...
2008-11-13 Michael Chanbnx2: Reorganize timeout constants.
2008-11-13 Michael Chanbnx2: Set rx buffer water marks based on MTU.
2008-11-12 Takashi IwaiMerge branch 'topic/fix/hda' into for-linus
2008-11-10 Takashi IwaiMerge branches 'topic/fix/misc' and 'topic/fix/hda...
2008-11-06 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
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 Takashi IwaiMerge branches 'topic/fix/misc' and 'topic/fix/hda...
2008-10-31 Takashi IwaiMerge commit 'v2.6.28-rc2' into topic/asoc
2008-10-30 Takashi IwaiMerge branches 'topic/fix/misc' and 'topic/fix/asoc...
2008-10-29 Takashi IwaiMerge branches 'topic/fix/hda' and 'topic/fix/misc...
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 Takashi IwaiMerge branches 'topic/fix/asoc', 'topic/fix/hda', ...
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-23 Takashi IwaiMerge branches 'topic/asoc', 'topic/misc-fixes' and...
2008-10-23 Linus TorvaldsMerge branch 'for-2.6.28' of git://linux-nfs.org/~bfiel...
2008-10-23 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-10-23 Haavard SkinnemoenMerge branches 'boards' and 'fixes' of git://git./linux...
2008-10-23 Len BrownMerge branch 'linus' into test
2008-10-20 Linus TorvaldsMerge git://git./linux/kernel/git/kyle/parisc-2.6
2008-10-20 Linus TorvaldsMerge branch 'bkl-removal' of git://git.lwn.net/linux-2.6
2008-10-20 Linus TorvaldsMerge branch 'next' of git://git./linux/kernel/git...
2008-10-20 Linus TorvaldsMerge branch 'linux-next' of git://git.infradead.org...
2008-10-20 Linus TorvaldsMerge git://git.infradead.org/mtd-2.6
next