[XFS] Fix merge failures
[linux-2.6] / drivers / net / bonding /
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  Holger Eitzenberger802.3ad: use standard ethhdr instead of ad_header
2008-12-26  Holger Eitzenberger802.3ad: generalize out mac address initializer
2008-12-26  Holger Eitzenberger802.3ad: initialize ports LACPDU from const initializer
2008-12-26  Holger Eitzenberger802.3ad: remove typedef around ad_system
2008-12-26  Holger Eitzenberger802.3ad: turn ports is_individual into a bool
2008-12-26  Holger Eitzenberger802.3ad: turn ports is_enabled into a bool
2008-12-26  Holger Eitzenberger802.3ad: make ntt bool
2008-12-26  Hannes Ederdrivers/net/bonding: fix sparse warnings: move decls...
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 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-18  Linus TorvaldsMerge branch 'fixes' of git://git./linux/kernel/git...
2008-12-18  Holger Eitzenbergerbonding: use port_params in __update_lacpdu_from_port
2008-12-18  Holger Eitzenbergerbonding: use port_params in __update_default_selected()
2008-12-18  Holger Eitzenbergerbonding: use port_params in __update_selected()
2008-12-18  Holger Eitzenbergerbonding: remove various function declarations
2008-12-18  Holger Eitzenbergerbonding: init port_params from template
2008-12-18  Holger Eitzenbergerbonding: use plain memcpy in __record_default()
2008-12-18  Holger Eitzenbergerbonding: use port_params in __record_pdu()
2008-12-18  Holger Eitzenbergerbonding: introduce and use port_params structure
2008-12-18  Holger Eitzenbergerbonding: improve elaborate port_state assignment
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  Holger Eitzenbergerbonding: turn all bond_parm_tbls const
2008-12-10  Holger Eitzenbergerbonding: make tbl argument to bond_parse_parm() const
2008-12-10  Holger Eitzenbergerbonding: remove duplicate declarations
2008-12-10  Holger Eitzenbergerbonding: use pr_debug instead of own macros
2008-12-10  Holger Eitzenbergerbonding: fix compile error if debug enabled
2008-12-10  Holger Eitzenbergerbonding: use table for mode names
2008-12-10  Holger Eitzenbergerbonding: add and use bond_is_lb()
2008-12-09  Linus TorvaldsMerge git://git.infradead.org/mtd-2.6
2008-12-06  David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-12-04  Wang Chenbond: Kill directly reference of netdev->priv
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-01  Takashi IwaiMerge branch 'upstream' into topic/asoc
2008-11-30  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
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-24  Paul MackerrasMerge branch 'merge' of git://git./linux/kernel/git...
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  Stephen Hemmingernetdev: add more functions to netdevice ops
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  Stephen Hemmingerbonding: convert to net_device_ops
2008-11-20  Stephen Hemmingernetdev: introduce dev_get_stats()
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-16  Linus TorvaldsMerge git://git./linux/kernel/git/brodo/pcmcia-2.6
2008-11-13  Wang Chennetdevice: safe convert to netdev_priv() #part-1
2008-11-12  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-11-12  Ingo MolnarMerge branch 'linus' into x86/crashdump
2008-11-12  Takashi IwaiMerge branch 'topic/fix/hda' into for-linus
2008-11-12  Len BrownMerge branch 'sony' into release
2008-11-12  Len BrownMerge branch 'power' into release
2008-11-12  Len BrownMerge branch 'misc' into release
2008-11-12  Len BrownMerge branch 'bugzilla-11539' into release
2008-11-12  Len BrownMerge branch 'bugzilla-11312' into release
2008-11-11  David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-11-10  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-11-10  Takashi IwaiMerge branches 'topic/fix/misc' and 'topic/fix/hda...
2008-11-10  Ingo MolnarMerge commit 'v2.6.28-rc4' into x86/apic
2008-11-10  Linus TorvaldsMerge branch 'master' of git://git./linux/kernel/git...
2008-11-09  Linus TorvaldsMerge branch 'for-2.6.28' of git://linux-nfs.org/~bfiel...
2008-11-08  Ingo MolnarMerge branch 'linus' into x86/cleanups
2008-11-07  Ingo MolnarMerge branch 'oprofile-for-tip' of git://git./linux...
2008-11-07  David S. MillerMerge branch 'davem-next' of /linux/kernel/git/jgarzik...
2008-11-07  David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-11-07  Niv SardiMerge branch 'master' of git://oss.sgi.com:8090/xfs...
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-06  Jay Vosburghbonding: alternate agg selection policies for 802.3ad
2008-11-06  Jay Vosburghbonding: Fix ALB mode to balance traffic on VLANs
2008-11-06  Brian Haleybonding: send IPv6 neighbor advertisement on failover
2008-11-05  James MorrisMerge branch 'master' into next
2008-11-04  Jay Vosburghbonding, net: Move last_rx update into bonding recv...
2008-11-03  Linus TorvaldsMerge git://git./linux/kernel/git/sfrench/cifs-2.6
2008-11-03  Linus TorvaldsMerge branch 'io-mappings-for-linus-2' of git://git...
2008-11-03  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
next