[XFS] Fix merge failures
[pandora-kernel.git] / fs / xfs / xfs_inode.h
2008-12-29 Lachlan McIlroy[XFS] Fix merge failures
2008-12-29 Linus TorvaldsMerge branch 'next' of git://git./linux/kernel/git...
2008-12-28 Linus TorvaldsMerge git://git./linux/kernel/git/sam/kbuild-next
2008-12-28 Linus TorvaldsMerge git://git./linux/kernel/git/wim/linux-2.6-nvram
2008-12-28 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-12-28 Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-next-2.6
2008-12-28 Linus TorvaldsMerge git://git./linux/kernel/git/sfrench/cifs-2.6
2008-12-28 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-12-28 Linus TorvaldsMerge branch 'for-linus' of git://git390.osdl.marist...
2008-12-28 Linus TorvaldsMerge branch 'sched-core-for-linus' of git://git./linux...
2008-12-28 Linus TorvaldsMerge branch 'tracing-core-for-linus' of git://git...
2008-12-28 Linus TorvaldsMerge branch 'x86-core-for-linus' of git://git./linux...
2008-12-28 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-12-25 James MorrisMerge branch 'next' into for-linus
2008-12-22 Lachlan McIlroy[XFS] Fix merge conflict in fs/xfs/xfs_rename.c
2008-12-12 Lachlan McIlroyMerge branch 'master' of git+ssh://git.melbourne.sgi...
2008-12-11 Christoph Hellwig[XFS] resync headers with libxfs
2008-12-10 Lachlan McIlroy[XFS] Remove unused tracing code
2008-12-05 Lachlan McIlroyMerge git://git./linux/kernel/git/torvalds/linux-2.6
2008-12-04 James MorrisMerge branch 'master' into next
2008-12-04 Christoph Hellwigmove inode tracing out of xfs_vnode.
2008-12-04 Christoph Hellwigkill dead inode flags
2008-12-04 Christoph Hellwigcleanup the inode reclaim path
2008-12-04 Christoph Hellwigremove unused prototypes for xfs_ihash_init / xfs_ihash...
2008-12-01 Christoph Hellwig[XFS] move inode allocation out xfs_iread
2008-12-01 Christoph Hellwig[XFS] kill the XFS_IMAP_BULKSTAT flag
2008-12-01 Christoph Hellwig[XFS] embededd struct xfs_imap into xfs_inode
2008-12-01 Christoph Hellwig[XFS] merge xfs_imap into xfs_dilocate
2008-12-01 Christoph Hellwig[XFS] remove dead code for old inode item recovery
2008-12-01 Christoph Hellwig[XFS] stop using xfs_itobp in xfs_iread
2008-12-01 Christoph Hellwig[XFS] kill xfs_dinode_core_t
2008-12-01 Dave Chinner[XFS] remove i_gen from incore inode
2008-11-28 Lachlan McIlroyMerge git://git./linux/kernel/git/torvalds/linux-2.6
2008-11-18 James MorrisMerge branch 'master' into next
2008-11-14 James MorrisMerge branch 'master' into next
2008-11-13 David HowellsCRED: Separate task security context from task_struct
2008-11-07 Niv SardiMerge branch 'master' of git://oss.sgi.com:8090/xfs...
2008-10-30 Christoph Hellwig[XFS] free partially initialized inodes using destroy_inode
2008-10-30 Christoph Hellwig[XFS] stop using xfs_itobp in xfs_bulkstat
2008-10-30 David Chinner[XFS] kill deleted inodes list
2008-10-30 David Chinner[XFS] move inode reclaim functions to xfs_sync.c
2008-10-30 David Chinner[XFS] Combine the XFS and Linux inodes
2008-10-30 Christoph Hellwig[XFS] Always use struct xfs_btree_block instead of...
2008-10-30 David Chinner[XFS] remove the mount inode list
2008-10-30 David Chinner[XFS] Remove xfs_iflush_all and clean up xfs_finish_rec...
2008-10-30 Barry Naujok[XFS] Sync up kernel and user-space headers
2008-10-30 Christoph Hellwig[XFS] make btree tracing generic
2008-10-30 David Chinner[XFS] Make use of the init-once slab optimisation.
2008-10-28 Ingo MolnarMerge commit 'v2.6.28-rc2' into x86/pci-ioapic-boot...
2008-10-17 Linus TorvaldsMerge branch 'for-linus' of git://www.jni.nu/cris
2008-10-16 Dmitry TorokhovMerge branch 'next' into for-linus
2008-10-15 Ingo MolnarMerge branches 'core/softlockup', 'core/softirq', ...
2008-10-13 Linus TorvaldsMerge git://git./linux/kernel/git/brodo/pcmcia-2.6
2008-10-13 Ingo MolnarMerge branch 'linus' into oprofile-v2
2008-10-12 Ingo MolnarMerge branches 'x86/xen', 'x86/build', 'x86/microcode...
2008-10-10 Linus TorvaldsMerge git://git./linux/kernel/git/steve/gfs2-2.6-nmw
2008-10-07 Russell KingMerge branch 'pxa-palm' into pxa-machines
2008-10-06 Ingo MolnarMerge branches 'x86/alternatives', 'x86/cleanups',...
2008-10-06 Ingo MolnarMerge branch 'x86/prototypes' into x86-v28-for-linus...
2008-10-06 Ingo MolnarMerge branch 'x86/header-guards' into x86-v28-for-linus...
2008-10-03 Ingo MolnarMerge commit 'v2.6.27-rc8' into x86/setup
2008-10-02 Ingo MolnarMerge commit 'v2.6.27-rc8' into genirq
2008-09-24 Ingo MolnarMerge commit 'v2.6.27-rc7' into x86/microcode
2008-09-24 Ingo MolnarMerge commit 'v2.6.27-rc7' into x86/pebs
2008-09-22 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-09-22 Ingo MolnarMerge commit 'v2.6.27-rc7' into x86/debug
2008-09-14 Ingo MolnarMerge commit 'v2.6.27-rc6' into timers/hpet
2008-09-10 Ingo MolnarMerge commit 'v2.6.27-rc6' into core/rcu
2008-09-10 Ingo MolnarMerge branch 'x86/pebs' into x86/unify-cpu-detect
2008-09-07 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-09-06 Ingo MolnarMerge branches 'x86/tracehook', 'x86/xsave' and 'x86...
2008-09-05 Ingo MolnarMerge branch 'linus' into x86/defconfig
2008-09-05 Ingo MolnarMerge commit '63cc8c75156462d4b42cbdd76c293b7eee7ddbfe':
2008-09-04 Ingo MolnarMerge branch 'x86/debug' into x86/cpu
2008-09-04 H. Peter AnvinMerge branch 'x86/cpu' into x86/xsave
2008-09-03 Jeff GarzikMerge branch 'r8169-fixes' of git://git./linux/kernel...
2008-09-02 Linus TorvaldsMerge branch 'for-2.6.27' of git://linux-nfs.org/~bfiel...
2008-09-01 David WoodhouseMerge branch 'master' of git://git./linux/kernel/git...
2008-08-28 James MorrisMerge branch 'master' into next
2008-08-27 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-08-27 Linus TorvaldsMerge branch 'drm-patches' of git://git./linux/kernel...
2008-08-25 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-08-23 Ingo MolnarMerge branch 'x86/cpu' into x86/x2apic
2008-08-22 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-08-22 Linus TorvaldsMerge branch 'for_linus' of git://git./linux/kernel...
2008-08-22 Ingo MolnarMerge branch 'x86/urgent' into x86/pat
2008-08-21 Ingo MolnarMerge branch 'linus' into x86/doc
2008-08-20 Linus TorvaldsMerge branch 'sh/for-2.6.27' of git://git./linux/kernel...
2008-08-20 Linus TorvaldsMerge git://git./linux/kernel/git/jejb/scsi-rc-fixes-2.6
2008-08-20 Ingo MolnarMerge branch 'linus' into x86/xen
2008-08-20 Ingo MolnarMerge branch 'linus' into x86/cleanups
2008-08-19 Paul MackerrasMerge branch 'merge' of git://git./linux/kernel/git...
2008-08-19 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-08-19 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-08-19 David S. MillerMerge branch 'master' of git://git./linux/kernel/git...
2008-08-19 Ingo MolnarMerge branch 'x86/oprofile' into oprofile
2008-08-18 Russell KingMerge branch 'for_rmk_17' of git://git.mnementh.co...
2008-08-18 Linus TorvaldsMerge git://git./linux/kernel/git/davem/sparc-2.6
2008-08-18 Jesse BarnesMerge branch 'pci-for-jesse' of git://git./linux/kernel...
2008-08-17 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
next