[XFS] Fix merge failures
[pandora-kernel.git] / fs / gfs2 / daemon.h
2008-05-01 Mark M. HoffmanMerge branch 'smsc47b397-new-id' into release
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 Steven Whitehouse[GFS2] Move gfs2_logd into log.c
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...
2007-10-13 Linus TorvaldsMerge git://git./linux/kernel/git/lethal/sh64-2.6
2007-10-13 Linus TorvaldsMerge git://git./linux/kernel/git/lethal/sh-2.6
2007-10-13 David WoodhouseMerge branch 'master' of git://git./linux/kernel/git...
2007-10-13 Dmitry TorokhovMerge /pub/scm/linux/kernel/git/torvalds/linux-2.6
2007-10-12 Linus TorvaldsMerge branch 'upstream' of git://git./linux/kernel...
2007-10-12 Linus TorvaldsMerge /pub/scm/linux/kernel/git/gregkh/pci-2.6
2007-10-12 Linus TorvaldsMerge /pub/scm/linux/kernel/git/gregkh/driver-2.6
2007-10-12 Linus TorvaldsMerge /pub/scm/linux/kernel/git/gregkh/usb-2.6
2007-10-12 Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/cpufreq
2007-10-12 Linus TorvaldsMerge git://git./linux/kernel/git/tglx/linux-2.6-x86
2007-10-12 Linus TorvaldsMerge branch 'upstream-linus' of git://git./linux/kerne...
2007-10-12 Linus TorvaldsMerge branch 'isdn-cleanups' of /linux/kernel/git/jgarz...
2007-10-12 Linus TorvaldsMerge branch 'hysdn' of /linux/kernel/git/jgarzik/misc-2.6
2007-10-12 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-10-12 Linus TorvaldsMerge branch 'for-linus' of git://git.kernel.dk/data...
2007-10-12 Linus TorvaldsMerge branch 'master' of git://git./linux/kernel/git...
2007-10-12 Linus TorvaldsMerge git://git./linux/kernel/git/steve/gfs2-2.6-nmw
2007-10-10 Steven Whitehouse[GFS2] Reduce number of gfs2_scand processes to one
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-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-14 Steven Whitehouse[GFS2] Fix unlinked file handling
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-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'
next