[XFS] Fix merge failures
[pandora-kernel.git] / fs / gfs2 / dir.c
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-05-01 Mark M. HoffmanMerge branch 'smsc47b397-new-id' into release
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-21 Linus TorvaldsMerge git://git./linux/kernel/git/lethal/sh-2.6
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-10 Josef Bacik[GFS2] fix GFP_KERNEL misuses
2008-03-31 Cyrill Gorcunov[GFS2] possible null pointer dereference fixup
2008-03-31 Steven Whitehouse[GFS2] Allow bmap to allocate extents
2008-03-31 Marcin Slusarz[GFS2] be*_add_cpu conversion
2008-03-31 Steven Whitehouse[GFS2] Eliminate (almost) duplicate field from gfs2_inode
2008-03-31 Steven Whitehouse[GFS2] Add extent allocation to block allocator
2008-03-31 Steven Whitehouse[GFS2] Merge gfs2_alloc_meta and gfs2_alloc_data
2008-03-31 Steven Whitehouse[GFS2] Update gfs2_trans_add_unrevoke to accept extents
2008-03-31 Steven Whitehouse[GFS2] Shrink & rename di_depth
2008-03-31 Bob Peterson[GFS2] Get rid of unneeded parameter in gfs2_rlist_alloc
2008-02-18 Lachlan McIlroyMerge git://git./linux/kernel/git/torvalds/linux-2...
2008-02-15 Steve FrenchMerge branch 'master' of /linux/kernel/git/torvalds...
2008-02-11 Linus TorvaldsMerge branch 'for-linus' of git://linux-nfs.org/~bfield...
2008-02-11 Jeff GarzikMerge branch 'r6040' of git://git./linux/kernel/git...
2008-02-09 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-02-09 David S. MillerMerge branch 'pending' of /linux/kernel/git/vxy/lksctp-dev
2008-02-08 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-02-08 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-02-08 Linus TorvaldsMerge branch 'for-linus' of git://oss.sgi.com:8090...
2008-02-07 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-02-07 Linus TorvaldsMerge branch 'upstream-linus' of git://git./linux/kerne...
2008-02-07 Linus TorvaldsMerge git://git./linux/kernel/git/davem/sparc-2.6
2008-02-07 Linus TorvaldsMerge git://git.infradead.org/mtd-2.6
2008-02-07 Linus TorvaldsMerge branch 'release' of git://git./linux/kernel/git...
2008-02-07 Linus TorvaldsMerge branch 'for-linus' of git://git.o-hand.com/linux...
2008-02-07 Linus TorvaldsMerge branch 'for-linus' of git://git.o-hand.com/linux...
2008-02-07 Linus TorvaldsMerge branch 'drm-patches' of git://git./linux/kernel...
2008-02-07 Linus TorvaldsMerge git://git./linux/kernel/git/davej/cpufreq
2008-02-07 Linus TorvaldsMerge branch 'for-2.6.25' of git://git./linux/kernel...
2008-02-07 David HowellsConvert ERR_PTR(PTR_ERR(p)) instances to ERR_CAST(p)
2008-02-07 Len BrownMerge branches 'release', 'misc' and 'misc-2.6.25'...
2008-02-07 Len BrownMerge branches 'release' and 'ppc-workaround' into...
2008-02-07 Len BrownMerge branches 'release' and 'hp-cid' into release
2008-02-07 Len BrownMerge branches 'release' and 'gpe-ack' into release
2008-02-07 Len BrownMerge branches 'release', 'cpuidle-2.6.25' and 'idle...
2008-02-07 Len BrownMerge branches 'release', 'bugzilla-6217', 'bugzilla...
2008-02-07 Len BrownMerge branches 'release' and 'autoload' into release
2008-02-07 Len BrownMerge branches 'release', 'asus', 'sony-laptop' and...
2008-02-07 Len BrownMerge branches 'release', 'acpi_pm_device_sleep_state...
2008-02-06 Linus TorvaldsMerge branch 'dmapool' of git://git./linux/kernel/git...
2008-02-03 David WoodhouseMerge git://git.infradead.org/~dedekind/ubi-2.6
2008-02-03 David WoodhouseMerge git://git.infradead.org/~kmpark/onenand-mtd-2.6
2008-02-03 David WoodhouseMerge git://git./linux/kernel/git/torvalds/linux-2...
2008-02-01 Linus TorvaldsMerge branch 'task_killable' of git://git./linux/kernel...
2008-01-31 Paul MackerrasMerge branch 'linux-2.6'
2008-01-27 Linus TorvaldsMerge git://git./linux/kernel/git/sfrench/cifs-2.6
2008-01-26 Linus TorvaldsMerge git://git./linux/kernel/git/jejb/scsi-misc-2.6
2008-01-26 Linus TorvaldsMerge branch 'upstream-linus' of git://git./linux/kerne...
2008-01-25 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-01-25 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-01-25 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-01-25 Linus TorvaldsMerge git://git./linux/kernel/git/steve/gfs2-2.6-nmw
2008-01-25 Steven Whitehouse[GFS2] Reduce inode size by moving i_alloc out of line
2007-11-20 Len BrownPull cpuidle into release branch
2007-10-29 Len BrownPull cpuidle into release branch
2007-10-23 Linus TorvaldsMerge git://git.infradead.org/battery-2.6
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-17 Linus TorvaldsMerge branch 'for-linus' of git://oss.sgi.com:8090...
2007-10-16 Linus TorvaldsMerge ssh:///pub/scm/linux/kernel/git/sam/kbuild
2007-10-16 Linus TorvaldsMerge git://git./linux/kernel/git/sam/kbuild
2007-10-15 Linus TorvaldsMerge branch 'devel' of /home/rmk/linux-2.6-arm
2007-10-15 Linus TorvaldsMerge branch 'locks' of git://linux-nfs.org/~bfields...
2007-10-15 Linus TorvaldsMerge git://git.linux-nfs.org/pub/linux/nfs-2.6
2007-10-15 Linus TorvaldsMerge branch 'release' of git://git./linux/kernel/git...
2007-10-15 Linus TorvaldsMerge /pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
2007-10-15 Linus TorvaldsMerge branch 'nfs-server-stable' of git://linux-nfs...
2007-10-14 Linus TorvaldsMerge branch 'release' of git://lm-sensors.org/kernel...
2007-10-14 David WoodhouseMerge branch 'master' of git://git.infradead.org/~dedek...
2007-10-14 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
next