[XFS] Fix merge failures
[pandora-kernel.git] / fs / xfs / xfs_rw.h
2008-05-01 Mark M. HoffmanMerge branch 'smsc47b397-new-id' into release
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 git://git./linux/kernel/git/davem/sparc-2.6
2008-02-08 Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-02-08 Len BrownMerge branches 'release', 'dmi' and 'misc' into release
2008-02-08 Linus TorvaldsMerge git://git./linux/kernel/git/agk/linux-2.6-dm
2008-02-08 Linus TorvaldsMerge branch 'release' of git://lm-sensors.org/kernel...
2008-02-08 Linus TorvaldsMerge branch 'for-linus' of git://oss.sgi.com:8090...
2008-02-07 Eric Sandeen[XFS] optimize XFS_IS_REALTIME_INODE w/o realtime config
2008-02-07 Christoph Hellwig[XFS] kill xfs_iocore_t
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] decontaminate vnode operations from behavior...
2007-10-15 Eric Sandeen[XFS] Remove m_nreadaheads
2007-07-23 David WoodhouseMerge branch 'master' of git://git./linux/kernel/git...
2007-07-22 Len BrownPull netlink into release branch
2007-07-22 Len BrownPull osi into release branch
2007-07-22 Len BrownPull video into release branch
2007-07-22 Len BrownPull throttle into release branch
2007-07-22 Len BrownPull misc into release branch
2007-07-22 Len BrownPull dock-bay into release branch
2007-07-22 Len BrownPull bugzilla-7880 into release branch
2007-07-22 Len BrownPull ec into release branch
2007-07-22 Len BrownPull sbs into release branch
2007-07-22 Len BrownPull battery into release branch
2007-07-22 Len BrownPull acpi-debug into release branch
2007-07-22 Len BrownPull acpica into release branch
2007-07-19 Linus TorvaldsMerge branch 'release' of git://lm-sensors.org/kernel...
2007-07-19 Steve FrenchMerge branch 'master' of /linux/kernel/git/torvalds...
2007-07-17 Linus TorvaldsMerge git://git./linux/kernel/git/wim/linux-2.6-watchdog
2007-07-17 Linus TorvaldsMerge branch 'release' of git://git./linux/kernel/git...
2007-07-17 Linus TorvaldsMerge branch 'merge' of git://git./linux/kernel/git...
2007-07-17 Linus TorvaldsMerge branch 'upstream-linus' of /linux/kernel/git...
2007-07-16 Linus TorvaldsMerge branch 'drm-patches' of ssh:///linux/kernel/git...
2007-07-16 Linus TorvaldsMerge branch 'upstream-linus' of git://git./linux/kerne...
2007-07-16 Linus TorvaldsMerge /pub/scm/linux/kernel/git/lethal/sh-2.6
2007-07-15 Linus TorvaldsMerge git://git.infradead.org/battery-2.6
2007-07-15 Linus TorvaldsMerge /pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
2007-07-15 Linus TorvaldsMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2007-07-15 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-07-15 Linus TorvaldsMerge branch 'for-linus' of git://oss.sgi.com:8090...
2007-07-14 David Chinner[XFS] Cleanup inode extent size hint extraction
2007-07-14 David Chinner[XFS] Make hole punching at EOF atomic.
2006-09-26 Tony LuckPull esi-support into release branch
2006-09-26 Tony LuckPull model-name into release branch
2006-07-15 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2006-07-05 Jeff GarzikMerge branch 'upstream' of git://lost.foo-projects...
2006-07-04 Linus TorvaldsMerge git://git.infradead.org/hdrinstall-2.6
2006-07-04 Linus TorvaldsMerge branch 'devel' of /home/rmk/linux-2.6-serial
2006-07-03 Steven WhitehouseMerge git./linux/kernel/git/torvalds/linux-2.6
2006-06-29 Dave JonesMerge ../linus
2006-06-28 Linus TorvaldsMerge /linux/kernel/git/wim/linux-2.6-watchdog
2006-06-26 Linus TorvaldsMerge git://git./linux/kernel/git/sam/kbuild
2006-06-26 David WoodhouseMerge branch 'master' of git://git./linux/kernel/git...
2006-06-26 Dmitry TorokhovMerge /pub/scm/linux/kernel/git/torvalds/linux-2.6
2006-06-25 Steve FrenchMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2006-06-24 Russell KingMerge signal handler branch
2006-06-24 Trond MyklebustMerge branch 'master' of /home/trondmy/kernel/linux...
2006-06-23 Tony LuckAuto-update from upstream
2006-06-23 Linus TorvaldsMerge branch 'release' of git://git./linux/kernel/git...
2006-06-23 Linus TorvaldsMerge branch 'devel' of /home/rmk/linux-2.6-mmc
2006-06-23 Linus TorvaldsMerge branch 'devel' of /home/rmk/linux-2.6-serial
2006-06-23 Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/cpufreq
2006-06-23 Linus TorvaldsMerge git://git./linux/kernel/git/paulus/powerpc
2006-06-23 Jeff GarzikMerge branch 'upstream' of git://electric-eye.fr.zoreil...
2006-06-23 Jeff GarzikMerge branch 'master' into upstream
2006-06-23 Jeff GarzikMerge branch 'master' into upstream
2006-06-22 Linus TorvaldsMerge /pub/scm/linux/kernel/git/gregkh/pci-2.6
2006-06-22 Linus TorvaldsMerge git://oss.sgi.com:8090/xfs-2.6
2006-06-20 Nathan ScottMerge HEAD from ../linux-2.6
2006-06-18 Nathan Scott[XFS] Push some common code out of write path into...
2006-06-16 Len BrownPull bugzilla-5737 into release branch
2006-06-15 Len BrownPull bugzilla-5653 into release branch
2006-06-09 Nathan Scott[XFS] Resolve a namespace collision on remaining vtypes...
2006-04-02 Dmitry TorokhovManual merge with Linus.
2006-03-31 Steven WhitehouseMerge branch 'master'
2006-03-31 Steve FrenchMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2006-03-30 Linus TorvaldsMerge branch 'drm-patches' of git://git./linux/kernel...
2006-03-30 Jeff GarzikMerge branch 'upstream'
2006-03-30 Jeff GarzikMerge branch 'mv-merge'
2006-03-28 Russell KingMerge nommu tree
next