[XFS] Fix merge failures
[pandora-kernel.git] / fs / xfs / linux-2.6 / xfs_super.c
2008-12-29 Lachlan McIlroy[XFS] Fix merge failures
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 branches 'x86/apic', 'x86/cleanups', 'x86/cpufeat...
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-12 Ingo MolnarMerge commit 'v2.6.28-rc8' into x86/mm
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 Hellwigkill xfs_unmount_flush
2008-12-04 Christoph Hellwigremove leftovers of shared read-only support
2008-12-04 Christoph Hellwigkill dead inode flags
2008-12-03 Ingo MolnarMerge commit 'v2.6.28-rc7'; branch 'x86/dumpstack'...
2008-12-01 Christoph Hellwig[XFS] remove xfs_vfsops.h
2008-12-01 Dave Chinner[XFS] fix error inversion problems with data flushing
2008-12-01 Christoph Hellwig[XFS] fix spurious gcc warnings
2008-11-30 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
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 Takashi IwaiMerge branch 'topic/fix/hda' into for-linus
2008-11-24 Paul MackerrasMerge branch 'merge' of git://git./linux/kernel/git...
2008-11-21 Takashi IwaiMerge branches 'topic/fix/hda' and 'topic/fix/sound...
2008-11-18 Takashi IwaiMerge branches 'topic/fix/hda' and 'topic/fix/misc...
2008-11-12 Takashi IwaiMerge branch 'topic/fix/hda' into for-linus
2008-11-10 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-11-10 Takashi IwaiMerge branches 'topic/fix/misc' and 'topic/fix/hda...
2008-11-07 Niv SardiMerge branch 'master' of git://oss.sgi.com:8090/xfs...
2008-11-06 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-11-06 Linus TorvaldsMerge git://git.infradead.org/mtd-2.6
2008-11-06 Ingo MolnarMerge branch 'iommu-fixes-2.6.28' of git://git./linux...
2008-11-05 James MorrisMerge branch 'master' into next
2008-11-03 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-11-03 Takashi IwaiMerge branches 'topic/fix/misc' and 'topic/fix/hda...
2008-11-02 Linus TorvaldsMerge git://git./linux/kernel/git/davem/sparc-2.6
2008-10-31 Takashi IwaiMerge commit 'v2.6.28-rc2' into topic/asoc
2008-10-31 Linus TorvaldsMerge git://git./linux/kernel/git/davem/sparc-2.6
2008-10-30 Linus TorvaldsMerge git://git./linux/kernel/git/brodo/pcmcia-2.6
2008-10-30 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-10-30 Takashi IwaiMerge branches 'topic/fix/misc' and 'topic/fix/asoc...
2008-10-30 Christoph Hellwig[XFS] fix biosize option
2008-10-30 Christoph Hellwig[XFS] fix the noquota mount option
2008-10-30 Christoph Hellwig[XFS] kill struct xfs_mount_args
2008-10-30 David Chinner[XFS] Allocate the struct xfs_ail
2008-10-30 David Chinner[XFS] kill deleted inodes list
2008-10-30 Lachlan McIlroy[XFS] Fix build warning - xfs_fs_alloc_inode() needs...
2008-10-30 David Chinner[XFS] Prevent use-after-free caused by synchronous...
2008-10-30 David Chinner[XFS] Combine the XFS and Linux inodes
2008-10-30 David Chinner[XFS] Never call mark_inode_dirty_sync() directly
2008-10-30 David Chinner[XFS] Move remaining quiesce code.
2008-10-30 David Chinner[XFS] Kill SYNC_CLOSE
2008-10-30 David Chinner[XFS] make SYNC_DELWRI no longer use xfs_sync
2008-10-30 David Chinner[XFS] make SYNC_ATTR no longer use xfs_sync
2008-10-30 David Chinner[XFS] move xfssyncd code to xfs_sync.c
2008-10-30 David Chinner[XFS] move sync code to its own file
2008-10-30 Christoph Hellwig[XFS] make btree tracing generic
2008-10-30 Lachlan McIlroy[XFS] Remove kmem_zone_t argument from xfs_inode_init_o...
2008-10-30 David Chinner[XFS] Make use of the init-once slab optimisation.
2008-10-29 Jesper NilssonMerge branch 'for-next' of git://jni.nu/cris into cris_...
2008-10-29 Takashi IwaiMerge branches 'topic/fix/hda' and 'topic/fix/misc...
2008-10-28 Linus TorvaldsMerge branch 'irq-fixes-for-linus' of git://git./linux...
2008-10-28 Ingo MolnarMerge commit 'v2.6.28-rc2' into x86/doc
2008-10-28 Ingo MolnarMerge commit 'v2.6.28-rc2' into x86/pci-ioapic-boot...
2008-10-28 Paul MundtMerge branches 'sh/serial-rework' and 'sh/oprofile'
2008-10-27 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-10-27 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-10-27 Takashi IwaiMerge branches 'topic/fix/asoc', 'topic/fix/hda', ...
2008-10-27 Ingo MolnarMerge commit 'v2.6.28-rc2' into x86/uv
2008-10-27 Ingo MolnarMerge commit 'v2.6.28-rc2' into tracing/urgent
2008-10-26 Linus TorvaldsMerge branch 'for-linus' of git://neil.brown.name/md
2008-10-26 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-10-26 Linus TorvaldsMerge branch 'for-upstream' of git://git./linux/kernel...
2008-10-26 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-10-25 Len BrownMerge branch 'i7300_idle' into release
2008-10-24 Ingo MolnarMerge commit 'v2.6.28-rc1' into sched/urgent
2008-10-24 Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-10-24 Linus TorvaldsMerge git://git./linux/kernel/git/davem/sparc-2.6
2008-10-23 Linus TorvaldsMerge branch 'for-linus' of git://git.o-hand.com/linux...
2008-10-23 Linus TorvaldsMerge branch 'for-linus' of /home/rmk/linux-2.6-arm
2008-10-23 Linus TorvaldsMerge branch 'for-linus' of git://git.o-hand.com/linux...
2008-10-23 Linus TorvaldsMerge git://git./linux/kernel/git/jejb/scsi-misc-2.6
2008-10-23 Linus TorvaldsMerge branch 'x86-fixes-for-linus' of git://git./linux...
2008-10-23 Linus TorvaldsMerge branch 'proc' of git://git./linux/kernel/git...
2008-10-23 Linus TorvaldsMerge branch 'v28-range-hrtimers-for-linus-v2' of git...
2008-10-23 Linus TorvaldsMerge git://git./linux/kernel/git/sfrench/cifs-2.6
2008-10-23 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-10-23 Linus TorvaldsMerge git://git./linux/kernel/git/hskinnemoen/avr32-2.6
2008-10-23 Linus TorvaldsMerge git://git./linux/kernel/git/viro/bdev
2008-10-23 Takashi IwaiMerge branches 'topic/asoc', 'topic/misc-fixes' and...
2008-10-23 Linus TorvaldsMerge branch 'for-2.6.28' of git://linux-nfs.org/~bfiel...
2008-10-23 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-10-23 Linus TorvaldsMerge git://git./linux/kernel/git/czankel/xtensa-2.6
2008-10-23 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-10-23 Haavard SkinnemoenMerge branches 'boards' and 'fixes' of git://git./linux...
2008-10-23 Len BrownMerge branch 'linus' into test
2008-10-21 Al Viro[PATCH] propagate mode through open_bdev_excl/close_bde...
2008-10-21 Benjamin HerrenschmidtMerge commit 'gcl/gcl-next'
2008-10-21 Benjamin HerrenschmidtMerge commit 'jwb/jwb-next'
next