[XFS] Fix merge failures
[pandora-kernel.git] / fs / gfs2 / ops_inode.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-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-03-31 Denis Cheng[GFS2] remove gfs2_dev_iops
2008-02-07 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
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 Wendy Cheng[GFS2] Remove lock methods for lock_nolock protocol
2008-01-25 Steven Whitehouse[GFS2] Clean up internal read function
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 branch 'upstream' of git://ftp.linux-mips.org...
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
2007-02-13 Kumar GalaMerge branch 'master' into for_paulus
2007-02-13 Paul MackerrasMerge branch 'for_paulus' of /linux/kernel/git/galak...
2007-02-12 Linus TorvaldsMerge branch 'for-linus' of git://git390.osdl.marist...
2007-02-12 Arjan van de Ven[PATCH] mark struct inode_operations const 2
2006-12-12 Dave JonesMerge ../linus
2006-10-22 David WoodhouseMerge git://git.infradead.org/~dwmw2/cafe-2.6
2006-10-21 Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/agpgart
2006-10-21 David WoodhouseMerge branch 'master' of git://git./linux/kernel/git...
2006-10-13 Linus TorvaldsMerge git://git./linux/kernel/git/sfrench/cifs-2.6
2006-10-08 Linus TorvaldsMerge branch 'upstream-linus' of git://git./linux/kerne...
2006-10-05 Linus TorvaldsMerge /pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
2006-10-04 Linus TorvaldsMerge /pub/scm/linux/kernel/git/mchehab/v4l-dvb
2006-10-04 Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/configh
2006-10-04 Linus TorvaldsMerge git://git./linux/kernel/git/steve/gfs2-2.6
2006-10-02 Steven WhitehouseMerge branch 'master' into gfs2
2006-09-28 Steven WhitehouseMerge branch 'master' into gfs2
2006-09-25 Steven Whitehouse[GFS2] Fix up merge of Linus' kernel into GFS2
next