[XFS] Fix merge failures
[pandora-kernel.git] / fs / gfs2 / quota.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-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 Steven Whitehouse[GFS2] Streamline quota lock/check for no-quota case
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
2006-09-21 Steven WhitehouseMerge branch 'master' into gfs2
2006-09-13 Steven WhitehouseMerge branch 'master' into gfs2
2006-09-05 Steven Whitehouse[GFS2] Make headers compile on their own
2006-09-04 Steven Whitehouse[GFS2] Change all types to uX style
2006-09-04 Steven WhitehouseMerge branch 'master' into gfs2
2006-09-01 Steven Whitehouse[GFS2] Update copyright, tidy up incore.h
2006-08-29 Steven WhitehouseMerge branch 'master' into gfs2
2006-08-07 Steven WhitehouseMerge branch 'master'
2006-07-31 Steven WhitehouseMerge branch 'master'
2006-07-17 Steven WhitehouseMerge branch 'master'
2006-07-06 Steven WhitehouseMerge branch 'master'
2006-07-05 Steven WhitehouseMerge branch 'master'
2006-07-03 Steven WhitehouseMerge git./linux/kernel/git/torvalds/linux-2.6
2006-06-20 Steven WhitehouseMerge branch 'master'
2006-06-19 Steven WhitehouseMerge branch 'master'
2006-06-06 Steven WhitehouseMerge branch 'master'
2006-05-25 Steven WhitehouseMerge branch 'master'
2006-05-18 Steven Whitehouse[GFS2] Update copyright date to 2006
2006-05-12 Steven WhitehouseMerge branch 'master'
2006-04-28 Adrian Bunk[GFS2] [-mm patch] fs/gfs2/: possible cleanups
2006-04-27 David TeiglandMerge branch 'master'
2006-04-21 Steven WhitehouseMerge branch 'master'
2006-04-03 Steven WhitehouseMerge branch 'master'
2006-03-31 Steven WhitehouseMerge branch 'master'
2006-03-20 Steven WhitehouseMerge branch 'master'
2006-02-27 Steven WhitehouseMerge branch 'master'
2006-02-23 Steven WhitehouseMerge branch 'master'
2006-01-20 David TeiglandMerge branch 'master'
2006-01-18 David TeiglandMerge branch 'master'
2006-01-16 David Teigland[GFS2] The core of GFS2