[XFS] Fix merge failures
[pandora-kernel.git] / include / linux / ioprio.h
2008-07-29 Anton VorontsovMerge branch 'master' of /home/cbou/linux-2.6
2008-07-11 David WoodhouseMerge branch 'master' of git://git./linux/kernel/git...
2008-07-10 Russell KingMerge branches 'at91', 'dyntick', 'ep93xx', 'iop',...
2008-07-03 Russell KingMerge branch 'fb' into devel
2008-05-20 Jiri KosinaMerge branch 'master' of git://git./linux/kernel/git...
2008-05-19 Linus TorvaldsMerge branch 'drm-patches' of git://git./linux/kernel...
2008-05-19 Lachlan McIlroyMerge git://git./linux/kernel/git/torvalds/linux-2...
2008-05-17 Russell KingMerge branch 'omap-fixes' of git://git./linux/kernel...
2008-05-17 Russell KingMerge branch 'sa1100'
2008-05-15 David S. MillerMerge branch 'master' of git://git./linux/kernel/git...
2008-05-15 David S. MillerMerge branch 'master' of git://git./linux/kernel/git...
2008-05-14 Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-05-13 Linus TorvaldsMerge git://git./linux/kernel/git/jejb/scsi-rc-fixes-2.6
2008-05-12 Linus TorvaldsMerge git://git./linux/kernel/git/davem/sparc-2.6
2008-05-11 Linus TorvaldsMerge git://git./linux/kernel/git/davem/sparc-2.6
2008-05-11 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-05-09 Russell KingMerge branch 'for-rmk' of git://git./linux/kernel/git...
2008-05-09 Linus TorvaldsMerge git://git./linux/kernel/git/sfrench/cifs-2.6
2008-05-09 Linus TorvaldsMerge git://git./linux/kernel/git/lethal/sh-2.6
2008-05-09 Linus TorvaldsMerge git://git./linux/kernel/git/herbert/crypto-2.6
2008-05-09 Linus TorvaldsMerge branch 'merge' of git://git./linux/kernel/git...
2008-05-09 Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-05-09 Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-05-09 Linus TorvaldsMerge git://git./linux/kernel/git/davem/sparc-2.6
2008-05-08 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-05-08 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-05-08 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-05-08 Linus TorvaldsMerge branch 'for-linus' of git://git.kernel.dk/linux...
2008-05-07 Jens Axboecfq-iosched: make io priorities inherit CPU scheduling...
2008-05-01 Mark M. HoffmanMerge branch 'smsc47b397-new-id' into release
2008-02-07 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-02-07 Len BrownMerge branches 'release', 'misc' and 'misc-2.6.25'...
2008-02-07 Len BrownMerge branches 'release' and 'ppc-workaround' into...
2008-02-07 Len BrownMerge branches 'release' and 'hp-cid' into release
2008-02-07 Len BrownMerge branches 'release' and 'gpe-ack' into release
2008-02-07 Len BrownMerge branches 'release', 'cpuidle-2.6.25' and 'idle...
2008-02-07 Len BrownMerge branches 'release', 'bugzilla-6217', 'bugzilla...
2008-02-07 Len BrownMerge branches 'release' and 'autoload' into release
2008-02-07 Len BrownMerge branches 'release', 'asus', 'sony-laptop' and...
2008-02-07 Len BrownMerge branches 'release', 'acpi_pm_device_sleep_state...
2008-02-06 Linus TorvaldsMerge branch 'dmapool' of git://git./linux/kernel/git...
2008-02-03 David WoodhouseMerge git://git.infradead.org/~dedekind/ubi-2.6
2008-02-03 David WoodhouseMerge git://git.infradead.org/~kmpark/onenand-mtd-2.6
2008-02-03 David WoodhouseMerge git://git./linux/kernel/git/torvalds/linux-2...
2008-02-01 Linus TorvaldsMerge branch 'task_killable' of git://git./linux/kernel...
2008-01-31 Paul MackerrasMerge branch 'linux-2.6'
2008-01-30 Linus TorvaldsMerge git://git./linux/kernel/git/gregkh/driver-2.6
2008-01-28 Linus TorvaldsMerge git://git./linux/kernel/git/wim/linux-2.6-watchdog
2008-01-28 Linus TorvaldsMerge git://git./linux/kernel/git/lethal/sh-2.6
2008-01-28 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-01-28 Linus TorvaldsMerge branch 'for-2.6.25' of git://git.kernel.dk/linux...
2008-01-28 Linus TorvaldsMerge branch 'blk-end-request' of git://git.kernel...
2008-01-28 Linus TorvaldsMerge branch 'sg' of git://git.kernel.dk/linux-2.6...
2008-01-28 Linus TorvaldsMerge branch 'cfq-ioc-share' of git://git.kernel.dk...
2008-01-28 Jens Axboeioprio: move io priority from task_struct to io_context
2007-10-13 Dmitry TorokhovMerge /pub/scm/linux/kernel/git/torvalds/linux-2.6
2007-09-25 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-09-12 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-08-31 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-07-23 David WoodhouseMerge branch 'master' of git://git./linux/kernel/git...
2007-07-22 Linus TorvaldsMerge /pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
2007-07-22 Linus TorvaldsMerge branch 'devel' of /home/rmk/linux-2.6-arm
2007-07-22 Linus TorvaldsMerge branch 'for-linus' of git://git.o-hand.com/linux...
2007-07-22 Linus TorvaldsMerge branch 'for-linus' of git://git.o-hand.com/linux...
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-21 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-07-20 Linus TorvaldsMerge branch 'release' of git://git./linux/kernel/git...
2007-07-20 Linus TorvaldsMerge branch 'master' of git://git./linux/kernel/git...
2007-07-20 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-07-20 Linus TorvaldsMerge /pub/scm/linux/kernel/git/lethal/sh-2.6
2007-07-20 Linus TorvaldsMerge branch 'linus' of /linux/kernel/git/perex/alsa
2007-07-20 Linus TorvaldsMerge /pub/scm/linux/kernel/git/lethal/sh64-2.6
2007-07-20 Linus TorvaldsMerge branch 'cfq' of git://git.kernel.dk/data/git...
2007-07-20 Vasily Tarasovcfq: async queue allocation per priority
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-16 Jeff GarzikMerge branch 'upstream-jgarzik' of git://git./linux...
2007-07-16 Linus TorvaldsMerge /pub/scm/linux/kernel/git/lethal/sh-2.6
2007-07-15 Linus TorvaldsMerge /pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
2007-07-13 Linus TorvaldsMerge branch 'ioat-md-accel-for-linus' of git://lost...
2007-07-12 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-07-12 Linus TorvaldsMerge branch 'devel' of /home/rmk/linux-2.6-arm
2007-07-12 Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/cpufreq
2007-07-12 Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/agpgart
2007-07-12 Linus TorvaldsMerge branch 'release' of git://git./linux/kernel/git...
2007-07-12 David S. MillerMerge /linux/kernel/git/holtmann/bluetooth-2.6
2007-07-11 David WoodhouseMerge branch 'master' of git://git./linux/kernel/git...
2007-07-11 Paul MackerrasMerge branch 'for-2.6.23' into merge
next