[XFS] Fix merge conflict in fs/xfs/xfs_rename.c
[linux-2.6] / net / ipv6 /
2008-12-22  Lachlan McIlroy[XFS] Fix merge conflict in fs/xfs/xfs_rename.c
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-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  Linus TorvaldsMerge branch 'merge' of git://git./linux/kernel/git...
2008-12-16  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-12-16  Linus TorvaldsMerge branch 'sh/for-2.6.28' of git://git./linux/kernel...
2008-12-16  Linus TorvaldsMerge branch 'merge' of git://git./linux/kernel/git...
2008-12-16  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2008-12-16  Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-12-09  Jan Semberaipv6: silence log messages for locally generated multicast
2008-12-09  Linus TorvaldsMerge git://git.infradead.org/mtd-2.6
2008-12-04  Linus TorvaldsMerge branch 'for-2.6.28' of git://linux-nfs.org/~bfiel...
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  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-12-01  Linus TorvaldsMerge branch 'merge' of git://git./linux/kernel/git...
2008-11-30  Linus TorvaldsMerge branch 'sched-fixes-for-linus' of git://git....
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  Lachlan McIlroyMerge git://git./linux/kernel/git/torvalds/linux-2.6
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-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-21  Ingo MolnarMerge commit 'v2.6.28-rc6' into x86/urgent
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-20  Linus TorvaldsMerge branch 'release' of git://git./linux/kernel/git...
2008-11-20  Linus TorvaldsMerge git://git./linux/kernel/git/gregkh/usb-2.6
2008-11-20  Linus TorvaldsMerge git://git./linux/kernel/git/sfrench/cifs-2.6
2008-11-20  Linus TorvaldsMerge branch 'upstream' of git://ftp.linux-mips.org...
2008-11-20  Linus TorvaldsMerge branch 'core-fixes-for-linus' of git://git./linux...
2008-11-20  Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-11-20  Alexey Dobriyannet: fix tiny output corruption of /proc/net/snmp6
2008-11-20  Benjamin Theryipv6: use seq_release_private for ip6mr.c /proc entries
2008-11-20  Linus TorvaldsMerge branch 'x86/numa' of git://git./linux/kernel...
2008-11-19  Ingo MolnarMerge branch 'tip/urgent' of git://git./linux/kernel...
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  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-17  Russell KingMerge branch 'for-rmk' of git://git./linux/kernel/git...
2008-11-16  Linus TorvaldsMerge git://git./linux/kernel/git/brodo/pcmcia-2.6
2008-11-15  Linus TorvaldsMerge branch 'sh/for-2.6.28' of git://git./linux/kernel...
2008-11-15  Linus TorvaldsMerge git://git./linux/kernel/git/jejb/scsi-rc-fixes-2.6
2008-11-13  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2008-11-13  Brian Haleyipv6: routing header fixes
2008-11-12  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-11-12  Linus TorvaldsMerge branch 'kvm-updates/2.6.28' of git://git./linux...
2008-11-12  Linus TorvaldsMerge branch 'release' of git://git./linux/kernel/git...
2008-11-12  Takashi IwaiMerge branch 'topic/fix/hda' into for-linus
2008-11-12  Len BrownMerge branch 'processor-256' into release
2008-11-12  Len BrownMerge branch 'sysfs' into release
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-11917' 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  Ingo MolnarMerge branch 'devel' of git://git./linux/kernel/git...
2008-11-11  Linus TorvaldsMerge branch 'timers-fixes-for-linus' of git://git...
2008-11-11  Linus TorvaldsMerge branch 'sched-fixes-for-linus' of git://git....
2008-11-11  Linus TorvaldsMerge branch 'tracing-fixes-for-linus' of git://git...
2008-11-11  Linus TorvaldsMerge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
2008-11-11  Linus TorvaldsMerge branch 'upstream-linus' of git://git./linux/kerne...
2008-11-11  Linus TorvaldsMerge branch 'for_linus' of git://git./linux/kernel...
2008-11-11  Linus TorvaldsMerge branch 'merge' of git://git./linux/kernel/git...
2008-11-11  Linus TorvaldsMerge branch 'drm-fixes' of git://git./linux/kernel...
2008-11-11  Linus TorvaldsMerge branch 'upstream-linus' of git://git./linux/kerne...
2008-11-11  Linus TorvaldsMerge git://git./linux/kernel/git/davem/sparc-2.6
2008-11-11  Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-11-11  Ingo MolnarMerge branch 'devel' of git://git./linux/kernel/git...
2008-11-11  Benjamin Theryipv6: fix ip6_mr_init error path
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  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-09  Linus TorvaldsMerge branch 'cpus4096' of git://git./linux/kernel...
2008-11-07  Ingo MolnarMerge branch 'oprofile-for-tip' of git://git./linux...
2008-11-07  Linus TorvaldsMerge branch 'release' of git://git./linux/kernel/git...
2008-11-07  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-11-07  Linus TorvaldsMerge branch 'x86-fixes-for-linus' of git://git./linux...
2008-11-07  Linus TorvaldsMerge branch 'for_linus' of git://git./linux/kernel...
2008-11-07  David S. MillerMerge branch 'davem-fixes' of /linux/kernel/git/jgarzik...
next