[XFS] Fix merge failures
[pandora-kernel.git] / fs / xfs / xfs_inode.c
2008-12-29 Lachlan McIlroy[XFS] Fix merge failures
2008-12-28 Linus TorvaldsMerge git://git./linux/kernel/git/wim/linux-2.6-nvram
2008-12-25 Takashi IwaiMerge branch 'topic/snd-hrtimer' into to-push
2008-12-25 Takashi IwaiMerge branch 'topic/jack-mechanical' into to-push
2008-12-25 Takashi IwaiMerge branch 'topic/aoa' into to-push
2008-12-23 Ingo MolnarMerge branch 'x86/ptrace' into x86/tsc
2008-12-23 Ingo MolnarMerge branches 'x86/apic', 'x86/cleanups', 'x86/cpufeat...
2008-12-23 Ingo MolnarMerge commit 'v2.6.28-rc9' into x86/apic
2008-12-22 Lachlan McIlroy[XFS] Remove XFS_BUF_SHUT() and friends
2008-12-22 Lachlan McIlroy[XFS] Fix merge conflict in fs/xfs/xfs_rename.c
2008-12-20 Takashi IwaiMerge branch 'topic/pcsp-fix' into topic/misc
2008-12-19 Takashi IwaiMerge branch 'fix/hda' into topic/hda
2008-12-18 Linus TorvaldsMerge branch 'fixes' of git://git./linux/kernel/git...
2008-12-16 Ingo MolnarMerge commit 'v2.6.28-rc8' into x86/doc
2008-12-16 Ingo MolnarMerge commit 'v2.6.28-rc8' into x86/cpufeature
2008-12-12 Ingo MolnarMerge commit 'v2.6.28-rc8' into x86/mm
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-09 Linus TorvaldsMerge git://git.infradead.org/mtd-2.6
2008-12-05 Lachlan McIlroyMerge git://git./linux/kernel/git/torvalds/linux-2.6
2008-12-04 Christoph Hellwigmove vn_iowait / vn_iowake into xfs_aops.c
2008-12-04 Christoph Hellwigcleanup the inode reclaim path
2008-12-04 Linus TorvaldsMerge branch 'for-2.6.28' of git://linux-nfs.org/~bfiel...
2008-12-03 Ingo MolnarMerge commit 'v2.6.28-rc7'; branch 'x86/dumpstack'...
2008-12-02 Linus TorvaldsMerge branch 'linux-next' of git://git.infradead.org...
2008-12-02 Linus TorvaldsMerge git://git./linux/kernel/git/davem/sparc-2.6
2008-12-01 Takashi IwaiMerge branch 'upstream' into topic/asoc
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_VERSION_ defines
2008-12-01 Christoph Hellwig[XFS] kill xfs_dinode_core_t
2008-12-01 Christoph Hellwig[XFS] factor out xfs_read_agi helper
2008-11-30 Linus TorvaldsMerge branch 'linux-next' of git://git.infradead.org...
2008-11-30 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-11-28 David S. MillerMerge branch 'master' of git://git./linux/kernel/git...
2008-11-28 Lachlan McIlroyMerge git://git./linux/kernel/git/torvalds/linux-2.6
2008-11-26 Takashi IwaiMerge branch 'topic/misc' into topic/pcsp-fix
2008-11-25 Ingo MolnarMerge branches 'tracing/core', 'x86/urgent' and 'x86...
2008-11-25 Takashi IwaiMerge branch 'topic/fix/hda' into for-linus
2008-11-24 Ingo MolnarMerge branch 'sched/rt' into sched/core
2008-11-24 Paul MackerrasMerge branch 'merge' of git://git./linux/kernel/git...
2008-11-24 Paul MackerrasMerge branch 'merge' of ssh:///linux/kernel/git/jwboyer...
2008-11-23 Ingo MolnarMerge commit 'v2.6.28-rc6' into irq/urgent
2008-11-23 Ingo MolnarMerge commit 'v2.6.28-rc6' into x86/debug
2008-11-21 Takashi IwaiMerge branches 'topic/fix/hda' and 'topic/fix/sound...
2008-11-20 Ingo MolnarMerge branch 'linus' into x86/memory-corruption-check
2008-11-20 Ingo MolnarMerge branch 'linus' into x86/uv
2008-11-19 Ingo MolnarMerge branch 'linus' into sched/core
2008-11-18 Ingo MolnarMerge branch 'iommu-fixes-2.6.28' of git://git./linux...
2008-11-18 Ingo MolnarMerge branch 'x86/urgent' into x86/cleanups
2008-11-18 Takashi IwaiMerge branches 'topic/fix/hda' and 'topic/fix/misc...
2008-11-18 Linus TorvaldsMerge git://git./linux/kernel/git/sfrench/cifs-2.6
2008-11-17 Linus TorvaldsMerge git://git./linux/kernel/git/davem/sparc-2.6
2008-11-17 Russell KingMerge branch 'for-rmk' of git://git./linux/kernel/git...
2008-11-17 Ingo MolnarMerge commit 'v2.6.28-rc5' into x86/cleanups
2008-11-17 Dave Chinner[XFS] Fix double free of log tickets
2008-11-16 Linus TorvaldsMerge git://git./linux/kernel/git/brodo/pcmcia-2.6
2008-11-15 Linus TorvaldsMerge branch 'sh/for-2.6.28' of git://git./linux/kernel...
2008-11-15 Linus TorvaldsMerge git://git./linux/kernel/git/jejb/scsi-rc-fixes-2.6
2008-11-14 James MorrisMerge branch 'master' into next
2008-11-13 Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2008-11-12 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-11-12 Linus TorvaldsMerge branch 'kvm-updates/2.6.28' of git://git./linux...
2008-11-12 Linus TorvaldsMerge branch 'release' of git://git./linux/kernel/git...
2008-11-12 Ingo MolnarMerge branch 'linus' into x86/crashdump
2008-11-12 Ingo MolnarMerge branch 'tracing/function-return-tracer' into...
2008-11-12 Ingo MolnarMerge branches 'tracing/ftrace' and 'tracing/urgent...
2008-11-12 Takashi IwaiMerge branch 'topic/fix/hda' into for-linus
2008-11-12 David S. MillerMerge branch 'davem-fixes' of /linux/kernel/git/jgarzik...
2008-11-11 David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-11-11 Paul MackerrasMerge branch 'linux-2.6' into next
2008-11-11 Ingo MolnarMerge branch 'devel' of git://git./linux/kernel/git...
2008-11-11 Linus TorvaldsMerge branch 'timers-fixes-for-linus' of git://git...
2008-11-11 Linus TorvaldsMerge branch 'sched-fixes-for-linus' of git://git....
2008-11-11 Linus TorvaldsMerge branch 'tracing-fixes-for-linus' of git://git...
2008-11-11 Linus TorvaldsMerge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
2008-11-10 Lachlan McIlroy[XFS] Wait for all I/O on truncate to zero file size
2008-11-07 Niv SardiMerge branch 'master' of git://oss.sgi.com:8090/xfs...
2008-11-06 Ingo MolnarMerge branch 'iommu-fixes-2.6.28' of git://git./linux...
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] Finish removing the mount pointer from the AIL API
2008-10-30 David Chinner[XFS] Move the AIL lock into the struct xfs_ail
2008-10-30 David Chinner[XFS] Allow 64 bit machines to avoid the AIL lock durin...
2008-10-30 David Chinner[XFS] kill deleted inodes list
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 Christoph Hellwig[XFS] cleanup btree record / key / ptr addressing macros.
2008-10-30 Christoph Hellwig[XFS] Cleanup maxrecs calculation.
2008-10-30 David Chinner[XFS] Remove xfs_iflush_all and clean up xfs_finish_rec...
2008-10-30 Lachlan McIlroy[XFS] Wait for all I/O on truncate to zero file size
2008-10-30 Christoph Hellwig[XFS] make btree tracing generic
2008-10-30 Lachlan McIlroy[XFS] Use xfs_idestroy() to cleanup an inode.
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...
next