[XFS] Fix merge failures
[pandora-kernel.git] / fs / xfs / linux-2.6 / xfs_ioctl32.h
2008-12-29 Lachlan McIlroy[XFS] Fix merge failures
2008-12-22 Lachlan McIlroy[XFS] Fix merge conflict in fs/xfs/xfs_rename.c
2008-12-05 Lachlan McIlroyMerge git://git./linux/kernel/git/torvalds/linux-2.6
2008-12-04 Christoph Hellwig[XFS] fix compile on 32 bit systems
2008-12-02 sandeen@sandeen.net[XFS] Hook up compat XFS_IOC_FSSETDM_BY_HANDLE ioctl...
2008-12-02 sandeen@sandeen.net[XFS] Hook up compat XFS_IOC_ATTRMULTI_BY_HANDLE ioctl...
2008-12-02 sandeen@sandeen.net[XFS] Hook up compat XFS_IOC_ATTRLIST_BY_HANDLE ioctl...
2008-12-02 sandeen@sandeen.net[XFS] Add compat handlers for data & rt growfs ioctls
2008-12-02 sandeen@sandeen.net[XFS] Add compat handlers for swapext ioctl
2008-12-02 sandeen@sandeen.net[XFS] Move compat ioctl structs & numbers into xfs_ioct...
2006-06-16 Len BrownPull bugzilla-5737 into release branch
2006-06-15 Len BrownPull bugzilla-5653 into release branch
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
2006-03-26 Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2006-03-25 Linus TorvaldsMerge branch 'audit.b3' of git://git./linux/kernel...
2006-03-25 Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/agpgart
2006-03-25 Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/cpufreq
2006-03-25 Linus TorvaldsMerge branch 'release' of git://git./linux/kernel/git...
2006-03-25 Linus TorvaldsMerge /pub/scm/linux/kernel/git/sam/kbuild
2006-03-24 Jeff GarzikMerge branch 'upstream'
2006-03-24 Linus TorvaldsMerge branch 'upstream-linus' of /linux/kernel/git...
2006-03-24 Trond MyklebustMerge branch 'linus'
2006-03-24 Linus TorvaldsMerge git://git./linux/kernel/git/aia21/ntfs-2.6
2006-03-24 Linus TorvaldsMerge branch 'upstream-linus' of /linux/kernel/git...
2006-03-24 Linus TorvaldsMerge branch 'blktrace' of git://brick.kernel.dk/data...
2006-03-24 Linus TorvaldsMerge /pub/scm/linux/kernel/git/mchehab/v4l-dvb
2006-03-23 Linus TorvaldsMerge /pub/scm/linux/kernel/git/gregkh/i2c-2.6
2006-03-23 Linus TorvaldsMerge /pub/scm/linux/kernel/git/gregkh/pci-2.6
2006-03-23 Linus TorvaldsMerge /pub/scm/linux/kernel/git/davem/net-2.6
2006-03-23 Linus TorvaldsMerge git://oss.sgi.com:8090/oss/git/xfs-2.6
2006-03-22 Nathan ScottMerge HEAD from ../linux-2.6
2006-03-20 Nathan Scott[XFS] Fix compiler warning from xfs_file_compat_invis_i...
2006-03-14 Nathan Scott[XFS] Switch over from linvfs names for sb/quotactl...
2005-12-06 Len BrownPull release into acpica branch
2005-11-21 David S. MillerMerge git://git.skbuff.net/gitroot/yoshfuji/linux-2...
2005-11-11 Jeff GarzikMerge branch 'atmel'
2005-11-10 Tony LuckPull context-bitmap into release branch
2005-11-09 Steve FrenchMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2005-11-09 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2005-11-07 Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/cpufreq
2005-11-07 Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/agpgart
2005-11-07 Linus TorvaldsMerge /pub/scm/linux/kernel/git/dtor/input
2005-11-07 Tony LuckAuto-update from upstream
2005-11-06 Thomas GleixnerMerge branch 'master' of /home/tglx/work/mtd/git/linux...
2005-11-05 Jeff GarzikMerge branch 'master'
2005-11-05 Jeff GarzikMerge branch 'master'
2005-11-05 Jeff GarzikMerge branch 'master'
2005-11-05 Jeff GarzikMerge branch 'master'
2005-11-05 Jeff GarzikMerge branch 'master'
2005-11-05 Jeff GarzikMerge branch 'master'
2005-11-05 James BottomleyMerge by Hand
2005-11-05 Jeff GarzikMerge branch 'master'
2005-11-05 Linus TorvaldsMerge branch 'srp' of /linux/kernel/git/roland/infiniband
2005-11-05 Linus TorvaldsMerge branch 'for-linus' of /linux/kernel/git/roland...
2005-11-05 Linus TorvaldsMerge /linux/kernel/git/paulus/powerpc-merge
2005-11-04 Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-serial
2005-11-04 Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2005-11-04 Linus TorvaldsMerge /pub/scm/linux/kernel/git/acme/net-2.6
2005-11-04 Linus TorvaldsMerge git://oss.sgi.com:8090/oss/git/xfs-2.6
2005-11-02 Nathan Scott[XFS] Update license/copyright notices to match the...
2005-06-26 Jeff GarzikMerge /spare/repo/linux-2.6/
2005-06-26 Thomas GleixnerMerge with rsync://fileserver/linux
2005-06-26 Jeff GarzikMerge upstream (approx. 2.6.12-git8) into 'janitor...
2005-06-23 Jeff GarzikMerge /spare/repo/linux-2.6/
2005-06-22 Jeff GarzikMerge /spare/repo/linux-2.6/
2005-06-22 Jeff GarzikMerge upstream kernel changes into 'C/H/S support'...
2005-06-18 Russell KingMerge with ../linux-2.6-smp
2005-06-17 James Bottomleymerge by hand (fix up qla_os.c merge error)
2005-06-15 Tony LuckAuto merge with /home/aegl/GIT/linus
2005-06-04 <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch skge
2005-06-04 <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch starfire
2005-06-04 <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch smc91x
2005-06-04 <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch remove-drivers
2005-06-04 <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch iff-running
2005-06-04 <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch viro
2005-06-04 <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch orinoco-hch
2005-06-04 <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch ppp
2005-06-04 <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch hdlc
2005-06-04 <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch dm9000
2005-06-04 <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch 8139too-iomap
2005-06-04 <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch 8139cp
2005-06-04 <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch r8169-fix
2005-06-04 <jgarzik@pretzel... Merge ... /spare/repo/libata-dev branch svw
2005-06-04 <jgarzik@pretzel... Merge ... /spare/repo/linux-2.6/.git branch HEAD
2005-06-04 <jgarzik@pretzel... Merge ... /spare/repo/linux-2.6/.git branch HEAD
2005-06-03 Linus TorvaldsMerge ... parisc-linux.org/~jejb/git/scsi-for-linus-2.6
2005-06-02 Dave KleikampMerge with /home/shaggy/git/linus-clean/
2005-06-02 David WoodhouseMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2005-06-01 Linus TorvaldsMerge ... /linux/kernel/git/sfrench/cifs-2.6
2005-05-31 Steve FrenchMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2005-05-31 Linus TorvaldsMerge ... /pub/scm/linux/kernel/git/aegl/linux-2.6
2005-05-31 <jgarzik@pretzel... Merge ... /linux/kernel/git/torvalds/linux-2.6.git...
2005-05-30 Anton AltaparmakovAutomatic merge with /usr/src/ntfs-2.6.git.
2005-05-29 <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch use-after-unmap
next