[XFS] Fix merge failures
[pandora-kernel.git] / fs / xfs / xfs_types.h
2008-07-10 Russell KingMerge branches 'at91', 'dyntick', 'ep93xx', 'iop',...
2008-07-03 Russell KingMerge branch 'fb' into devel
2008-05-07 Russell KingMerge branch 'irq-fix' of git://modarm9.com/gitsrc...
2008-05-03 Linus TorvaldsMerge git://git.infradead.org/battery-2.6
2008-05-01 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-05-01 Linus TorvaldsMerge branch 'release' of git://lm-sensors.org/kernel...
2008-04-30 Len BrownMerge branches 'release', 'acpica', 'bugzilla-10224...
2008-04-30 Paul MackerrasMerge git://git./pub/scm/linux/kernel/git/jk/spufs
2008-04-29 Russell KingMerge branches 'pxa' and 'orion-fixes1'
2008-04-29 Jeff GarzikMerge branch 'upstream-jeff' of git://git./linux/kernel...
2008-04-27 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-04-25 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-04-25 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-04-24 Trond MyklebustMerge branch 'devel'
2008-04-24 Steve FrenchMerge branch 'master' of /linux/kernel/git/torvalds...
2008-04-24 Paul MackerrasMerge branch 'powerpc-next' of /linux/kernel/git/galak...
2008-04-23 David WoodhouseMerge git://git.infradead.org/~dedekind/ubi-2.6
2008-04-22 Linus TorvaldsMerge branch 'for_linus' of git://git./linux/kernel...
2008-04-22 David WoodhouseMerge branch 'master' of git://git./linux/kernel/git...
2008-04-21 Linus TorvaldsMerge branch 'master' of git://git./linux/kernel/git...
2008-04-20 Haavard SkinnemoenMerge branch 'master' of git://git./linux/kernel/git...
2008-04-20 Haavard SkinnemoenMerge branch 'master' of git://git./linux/kernel/git...
2008-04-19 Russell KingMerge branch 'merge-fixes' into devel
2008-04-19 Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6.26
2008-04-18 Linus TorvaldsMerge git://git./linux/kernel/git/jejb/scsi-misc-2.6
2008-04-18 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-04-18 Linus TorvaldsMerge branch 'upstream-linus' of git://git./linux/kerne...
2008-04-18 Linus TorvaldsMerge git://git./linux/kernel/git/steve/gfs2-2.6-nmw
2008-04-18 Linus TorvaldsMerge branch 'release' of git://git./linux/kernel/git...
2008-04-18 Linus TorvaldsMerge branch 'for-linus' of git://oss.sgi.com:8090...
2008-04-18 Barry Naujok[XFS] remove bhv_vname_t and xfs_rename code
2007-11-20 Len BrownPull cpuidle into release branch
2007-11-17 Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/cpufreq
2007-10-29 Len BrownPull cpuidle into release branch
2007-10-23 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-10-23 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-10-23 Linus TorvaldsMerge git://git.infradead.org/battery-2.6
2007-10-20 Jeff GarzikMerge branch 'fixes-jgarzik' of git://git./linux/kernel...
2007-10-19 Linus TorvaldsMerge branch 'release' of git://git./linux/kernel/git...
2007-10-19 Linus TorvaldsMerge git://git./linux/kernel/git/sfrench/cifs-2.6
2007-10-18 David S. MillerMerge branch 'fixes-davem' of /linux/kernel/git/linvill...
2007-10-17 Linus TorvaldsMerge branch 'xen-upstream' of git://git./linux/kernel...
2007-10-17 Linus TorvaldsMerge git://git./linux/kernel/git/mingo/linux-2.6-sched
2007-10-17 Linus TorvaldsMerge branch 'for-linus' of git://git.kernel.dk/data...
2007-10-17 Linus TorvaldsMerge branch 'merge' of git://git./linux/kernel/git...
2007-10-17 Linus TorvaldsMerge branch 'for-linus' of git://oss.sgi.com:8090...
2007-10-15 Christoph Hellwig[XFS] use filldir internally
2005-12-06 Len BrownPull release into acpica branch
2005-11-21 David S. MillerMerge git://git.skbuff.net/gitroot/yoshfuji/linux-2...
2005-11-11 Jeff GarzikMerge branch 'atmel'
2005-11-10 Tony LuckPull context-bitmap into release branch
2005-11-09 Steve FrenchMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2005-11-09 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2005-11-07 Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/cpufreq
2005-11-07 Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/agpgart
2005-11-07 Linus TorvaldsMerge /pub/scm/linux/kernel/git/dtor/input
2005-11-07 Tony LuckAuto-update from upstream
2005-11-06 Thomas GleixnerMerge branch 'master' of /home/tglx/work/mtd/git/linux...
2005-11-05 Jeff GarzikMerge branch 'master'
2005-11-05 Jeff GarzikMerge branch 'master'
2005-11-05 Jeff GarzikMerge branch 'master'
2005-11-05 Jeff GarzikMerge branch 'master'
2005-11-05 Jeff GarzikMerge branch 'master'
2005-11-05 Jeff GarzikMerge branch 'master'
2005-11-05 James BottomleyMerge by Hand
2005-11-05 Jeff GarzikMerge branch 'master'
2005-11-05 Linus TorvaldsMerge branch 'srp' of /linux/kernel/git/roland/infiniband
2005-11-05 Linus TorvaldsMerge branch 'for-linus' of /linux/kernel/git/roland...
2005-11-05 Linus TorvaldsMerge /linux/kernel/git/paulus/powerpc-merge
2005-11-04 Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-serial
2005-11-04 Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2005-11-04 Linus TorvaldsMerge /pub/scm/linux/kernel/git/acme/net-2.6
2005-11-04 Linus TorvaldsMerge git://oss.sgi.com:8090/oss/git/xfs-2.6
2005-11-02 Nathan Scott[XFS] Update license/copyright notices to match the...
2005-11-01 Nathan Scott[XFS] Ondisk format extension for extended attributes...
2005-09-08 Linus TorvaldsMerge kernel.org:/home/rmk/linux-2.6-i2c manually
2005-08-28 James Bottomleyfix mismerge in ll_rw_blk.c
2005-08-18 Dave JonesMerge /pub/scm/linux/kernel/git/torvalds/linux-2.6
2005-08-15 Len BrownMerge 'acpi-2.6.12' branch into to-akpm
2005-08-15 Len BrownMerge ../to-linus-stable/
2005-08-11 Len BrownMerge acpi-2.6.12 to-akpm
2005-08-05 Len Brown[ACPI] Merge acpi-2.6.12 branch into 2.6.13-rc3
2005-08-04 Len Brown/home/lenb/src/to-akpm branch 'acpi-2.6.12'
2005-08-04 Len Brown/home/lenb/src/to-linus-stable branch 'acpi-2.6.12'
2005-08-03 Len Brown/home/lenb/src/to-linus branch 'acpi-2.6.12'
2005-07-30 Len Brown/home/lenb/src/to-linus branch 'acpi-2.6.12'
2005-07-23 Luming Yu/home/lenb/linux-2.6 branch 'acpi-2.6.12'
2005-07-12 Len Brown[ACPI] merge acpi-2.6.12 branch into latest Linux 2...
2005-07-02 David WoodhouseMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2005-06-28 Tony LuckAuto merge with /home/aegl/GIT/ia64-test
2005-06-28 Russell King[PATCH] ARM SMP: TLB implementations only affect local CPU
2005-06-27 Linus TorvaldsMerge /linux/kernel/git/dtor/input.git manually
2005-06-27 Jeff GarzikMerge /spare/repo/netdev-2.6/ branch 'ieee80211'
2005-06-27 Jeff GarzikMerge /spare/repo/linux-2.6/
2005-06-26 Jeff GarzikMerge /spare/repo/linux-2.6/
2005-06-26 Thomas GleixnerMerge with rsync://fileserver/linux
2005-06-26 Jeff GarzikMerge upstream (approx. 2.6.12-git8) into 'janitor...
2005-06-23 Anton AltaparmakovAutomatic merge with /usr/src/ntfs-2.6.git.
2005-06-23 Jeff GarzikMerge /spare/repo/linux-2.6/
2005-06-23 Steve FrenchMerge ... /linux/kernel/git/sfrench/cifs-2.6.git
next