[XFS] Fix merge failures
[pandora-kernel.git] / fs / xfs / xfs_dir2_node.h
2007-07-23 David WoodhouseMerge branch 'master' of git://git./linux/kernel/git...
2007-07-22 Len BrownPull netlink into release branch
2007-07-22 Len BrownPull osi into release branch
2007-07-22 Len BrownPull video into release branch
2007-07-22 Len BrownPull throttle into release branch
2007-07-22 Len BrownPull misc into release branch
2007-07-22 Len BrownPull dock-bay into release branch
2007-07-22 Len BrownPull bugzilla-7880 into release branch
2007-07-22 Len BrownPull ec into release branch
2007-07-22 Len BrownPull sbs into release branch
2007-07-22 Len BrownPull battery into release branch
2007-07-22 Len BrownPull acpi-debug into release branch
2007-07-22 Len BrownPull acpica into release branch
2007-07-19 Linus TorvaldsMerge branch 'release' of git://lm-sensors.org/kernel...
2007-07-19 Steve FrenchMerge branch 'master' of /linux/kernel/git/torvalds...
2007-07-17 Linus TorvaldsMerge git://git./linux/kernel/git/wim/linux-2.6-watchdog
2007-07-17 Linus TorvaldsMerge branch 'release' of git://git./linux/kernel/git...
2007-07-17 Linus TorvaldsMerge branch 'merge' of git://git./linux/kernel/git...
2007-07-17 Linus TorvaldsMerge branch 'upstream-linus' of /linux/kernel/git...
2007-07-16 Linus TorvaldsMerge branch 'drm-patches' of ssh:///linux/kernel/git...
2007-07-16 Linus TorvaldsMerge branch 'upstream-linus' of git://git./linux/kerne...
2007-07-16 Linus TorvaldsMerge /pub/scm/linux/kernel/git/lethal/sh-2.6
2007-07-15 Linus TorvaldsMerge git://git.infradead.org/battery-2.6
2007-07-15 Linus TorvaldsMerge /pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
2007-07-15 Linus TorvaldsMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2007-07-15 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-07-15 Linus TorvaldsMerge branch 'for-linus' of git://oss.sgi.com:8090...
2007-07-14 Christoph Hellwig[XFS] Reduce shouting by removing unnecessary macros...
2006-06-16 Len BrownPull bugzilla-5737 into release branch
2006-06-15 Len BrownPull bugzilla-5653 into release branch
2006-04-02 Dmitry TorokhovManual merge with Linus.
2006-03-31 Steven WhitehouseMerge branch 'master'
2006-03-31 Steve FrenchMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2006-03-30 Linus TorvaldsMerge branch 'drm-patches' of git://git./linux/kernel...
2006-03-30 Jeff GarzikMerge branch 'upstream'
2006-03-30 Jeff GarzikMerge branch 'mv-merge'
2006-03-28 Russell KingMerge nommu tree
2006-03-26 Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2006-03-25 Linus TorvaldsMerge branch 'audit.b3' of git://git./linux/kernel...
2006-03-25 Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/agpgart
2006-03-25 Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/cpufreq
2006-03-25 Linus TorvaldsMerge branch 'release' of git://git./linux/kernel/git...
2006-03-25 Linus TorvaldsMerge /pub/scm/linux/kernel/git/sam/kbuild
2006-03-24 Jeff GarzikMerge branch 'upstream'
2006-03-24 Linus TorvaldsMerge branch 'upstream-linus' of /linux/kernel/git...
2006-03-24 Trond MyklebustMerge branch 'linus'
2006-03-24 Linus TorvaldsMerge git://git./linux/kernel/git/aia21/ntfs-2.6
2006-03-24 Linus TorvaldsMerge branch 'upstream-linus' of /linux/kernel/git...
2006-03-24 Linus TorvaldsMerge branch 'blktrace' of git://brick.kernel.dk/data...
2006-03-24 Linus TorvaldsMerge /pub/scm/linux/kernel/git/mchehab/v4l-dvb
2006-03-23 Linus TorvaldsMerge /pub/scm/linux/kernel/git/gregkh/i2c-2.6
2006-03-23 Linus TorvaldsMerge /pub/scm/linux/kernel/git/gregkh/pci-2.6
2006-03-23 Linus TorvaldsMerge /pub/scm/linux/kernel/git/davem/net-2.6
2006-03-23 Linus TorvaldsMerge git://oss.sgi.com:8090/oss/git/xfs-2.6
2006-03-22 Nathan ScottMerge HEAD from ../linux-2.6
2006-03-17 Nathan Scott[XFS] endianess annotations for xfs_dir2_free_hdr_t
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-02 Nathan Scott[XFS] Remove xfs_macros.c, xfs_macros.h, rework headers...
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2