[XFS] Fix merge failures
[pandora-kernel.git] / fs / xfs / xfs_bmap_btree.h
2008-12-29 Lachlan McIlroy[XFS] Fix merge failures
2008-12-22 Lachlan McIlroy[XFS] Fix merge conflict in fs/xfs/xfs_rename.c
2008-12-05 Lachlan McIlroyMerge git://git./linux/kernel/git/torvalds/linux-2.6
2008-11-28 Lachlan McIlroyMerge git://git./linux/kernel/git/torvalds/linux-2.6
2008-11-07 Niv SardiMerge branch 'master' of git://oss.sgi.com:8090/xfs...
2008-10-30 Christoph Hellwig[XFS] Move XFS_BMAP_SANITY_CHECK out of line.
2008-10-30 Christoph Hellwig[XFS] Always use struct xfs_btree_block instead of...
2008-10-30 Christoph Hellwig[XFS] cleanup btree record / key / ptr addressing macros.
2008-10-30 Christoph Hellwig[XFS] Cleanup maxrecs calculation.
2008-10-30 Barry Naujok[XFS] Sync up kernel and user-space headers
2008-10-30 Christoph Hellwig[XFS] kill xfs_bmbt_log_block and xfs_bmbt_log_recs
2008-10-30 Christoph Hellwig[XFS] implement generic xfs_btree_delete/delrec
2008-10-30 Christoph Hellwig[XFS] implement generic xfs_btree_insert/insrec
2008-10-30 Christoph Hellwig[XFS] move xfs_bmbt_newroot to common code
2008-10-30 Christoph Hellwig[XFS] implement generic xfs_btree_update
2008-10-30 Christoph Hellwig[XFS] implement generic xfs_btree_lookup
2008-10-30 Christoph Hellwig[XFS] implement generic xfs_btree_decrement
2008-10-30 Christoph Hellwig[XFS] implement generic xfs_btree_increment
2008-10-30 Christoph Hellwig[XFS] make btree tracing generic
2008-10-30 Christoph Hellwig[XFS] split up xfs_btree_init_cursor
2008-07-10 Russell KingMerge branches 'at91', 'dyntick', 'ep93xx', 'iop',...
2008-05-07 Russell KingMerge branch 'irq-fix' of git://modarm9.com/gitsrc...
2008-05-01 Mark M. HoffmanMerge branch 'smsc47b397-new-id' into release
2008-04-30 Len BrownMerge branches 'release', 'acpica', 'bugzilla-10224...
2008-04-29 Russell KingMerge branches 'pxa' and 'orion-fixes1'
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-24 Trond MyklebustMerge branch 'devel'
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-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 'omap2-upstream' into devel
2008-04-18 Linus TorvaldsMerge git://git./linux/kernel/git/jejb/scsi-misc-2.6
2008-04-18 Linus TorvaldsMerge git://git./linux/kernel/git/steve/gfs2-2.6-nmw
2008-04-18 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-04-18 David S. MillerMerge branch 'master' of /linux/kernel/git/torvalds...
2008-04-18 Paul MackerrasMerge branch 'master' of git://git./linux/kernel/git...
2008-04-17 Tony LuckPull miscellaneous into release branch
2008-04-17 Tony LuckPull nptcg into release branch
2008-04-17 Tony LuckPull kvm-patches into release branch
2008-04-17 Tony LuckPull percpureserve into release branch
2008-04-17 Tony LuckPull regset into release branch
2008-04-17 Tony LuckPull virt-cpu-accounting into release branch
2008-04-17 Tony LuckPull fsys_gettimeofday into release branch
2008-04-16 Paul MackerrasMerge branch 'for-2.6.26' of /linux/kernel/git/olof...
2008-04-16 Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-04-15 Steve FrenchMerge branch 'master' of /linux/kernel/git/torvalds...
2008-04-14 Linus TorvaldsMerge branch 'upstream-linus' of git://git./linux/kerne...
2008-04-14 Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-04-14 Paul MackerrasMerge branch 'linux-2.6'
2008-04-11 Linus TorvaldsMerge branch 'docs' of git://git.lwn.net/linux-2.6
2008-04-11 Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-04-11 Linus TorvaldsMerge git://git./linux/kernel/git/davem/sparc-2.6
2008-04-10 Linus TorvaldsMerge branch 'for-linus' of git://oss.sgi.com:8090...
2008-04-10 Eric Sandeen[XFS] remove shouting-indirection macros from xfs_sb.h
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] endianess annotations for xfs_bmbt_rec_t
2007-10-15 Christoph Hellwig[XFS] cleanup defintions of BMBT_*BITLEN macros
2007-10-15 Christoph Hellwig[XFS] split ondisk vs incore versions of xfs_bmbt_rec_t
2007-04-30 Tony LuckPull percpu-dtc into release branch
2007-04-30 Tony LuckPull error-inject into release branch
2007-02-26 Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/cpufreq
2007-02-26 Linus TorvaldsMerge /pub/scm/linux/kernel/git/kyle/parisc-2.6
2007-02-26 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-02-26 Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/agpgart
2007-02-20 Russell KingMerge ARM fixes
2007-02-19 Linus TorvaldsMerge git://git.infradead.org/mtd-2.6
2007-02-19 Linus TorvaldsMerge branch 'for-linus' of /home/rmk/linux-2.6-arm
2007-02-19 Linus TorvaldsMerge branch 'for-linus' of ssh:///linux/kernel/git...
2007-02-17 John W. LinvilleMerge branch 'upstream' into upstream-jgarzik
2007-02-17 Jeff GarzikMerge branch 'gfar' of /linux/kernel/git/galak/powerpc...
2007-02-17 Len BrownPull bugzilla-7897 into release branch
2007-02-17 Len BrownPull bugzilla-7887 into release branch
2007-02-17 Len BrownPull bugzilla-7200 into release branch
2007-02-17 Len BrownPull remove-hotkey into release branch
2007-02-17 Len BrownPull sony into release branch
2007-02-16 Len BrownPull misc-for-upstream into release branch
2007-02-16 Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/agpgart
2007-02-16 Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/cpufreq
2007-02-14 Linus TorvaldsMerge branch 'for-linus' of /linux/kernel/git/roland...
2007-02-14 Linus TorvaldsMerge /pub/scm/linux/kernel/git/sfrench/cifs-2.6
2007-02-14 Linus TorvaldsMerge /linux/kernel/git/wim/linux-2.6-watchdog
2007-02-13 Trond MyklebustMerge branch 'master' of /home/trondmy/kernel/linux...
2007-02-13 Kumar GalaMerge branch 'master' into 85xx
2007-02-13 Kumar GalaMerge branch 'master' into 83xx
next