[XFS] Fix merge failures
[linux-2.6] / drivers / net / bonding / bond_ipv6.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-24  David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-12-16  David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-12-16  David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
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-06  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-12-03  David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
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-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-11  David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-11-07  David S. MillerMerge branch 'davem-next' of /linux/kernel/git/jgarzik...
2008-11-06  Brian Haleybonding: send IPv6 neighbor advertisement on failover