[XFS] Fix merge failure
[linux-2.6] / block / compat_ioctl.c
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  Christof Schmittblktrace: Add blktrace ioctls to SCSI generic devices
2008-01-17  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-01-14  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-12-10  Linus TorvaldsMerge branch 'for-linus' of git://oss.sgi.com:8090...
2007-11-27  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-11-20  Len BrownPull cpuidle into release branch
2007-11-17  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/cpufreq
2007-11-12  Linus TorvaldsMerge git://git./linux/kernel/git/sfrench/cifs-2.6
2007-11-05  Linus TorvaldsMerge /linux/kernel/git/jejb/scsi-rc-fixes-2.6
2007-11-03  Linus TorvaldsMerge branch 'v2.6.24-rc1-lockdep' of git://git./linux...
2007-11-03  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-11-03  Linus TorvaldsMerge git://git./linux/kernel/git/wim/linux-2.6-watchdog
2007-11-02  Paul MackerrasMerge branch 'linux-2.6' into merge
2007-11-01  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-10-30  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-10-30  Linus TorvaldsMerge branch 'release' of git://git./linux/kernel/git...
2007-10-29  Len BrownPull documentation into release branch
2007-10-29  Len BrownPull cpuidle into release branch
2007-10-29  Len BrownPull fujitsu into release branch
2007-10-29  Len BrownPull alexey-fixes into release branch
2007-10-29  Linus TorvaldsMerge branch 'upstream' of git://ftp.linux-mips.org...
2007-10-29  Linus TorvaldsMerge branch 'alpm' of /linux/kernel/git/jgarzik/libata-dev
2007-10-29  Linus TorvaldsMerge branch 'upstream-linus' of /linux/kernel/git...
2007-10-29  Linus TorvaldsMerge branch 'upstream-linus' of /linux/kernel/git...
2007-10-29  Linus TorvaldsMerge branch 'warnings-upstream' of /linux/kernel/git...
2007-10-29  Linus TorvaldsMerge branch 'for-linus' of git://git.kernel.dk/linux...
2007-10-29  Philip Langdalecompat_ioctl: fix block device compat ioctl regression
2007-10-23  Linus TorvaldsMerge git://git.infradead.org/battery-2.6
2007-10-19  Linus TorvaldsMerge branch 'release' of git://git./linux/kernel/git...
2007-10-19  Linus TorvaldsMerge git://git./linux/kernel/git/sfrench/cifs-2.6
2007-10-17  Linus TorvaldsMerge branch 'for-linus' of git://oss.sgi.com:8090...
2007-10-15  Linus TorvaldsMerge branch 'locks' of git://linux-nfs.org/~bfields...
2007-10-15  Linus TorvaldsMerge git://git.linux-nfs.org/pub/linux/nfs-2.6
2007-10-15  Linus TorvaldsMerge /pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
2007-10-15  Linus TorvaldsMerge branch 'nfs-server-stable' of git://linux-nfs...
2007-10-14  Linus TorvaldsMerge branch 'release' of git://lm-sensors.org/kernel...
2007-10-14  David WoodhouseMerge branch 'master' of git://git.infradead.org/~dedek...
2007-10-13  Linus TorvaldsMerge git://git./linux/kernel/git/lethal/sh64-2.6
2007-10-13  Linus TorvaldsMerge git://git./linux/kernel/git/lethal/sh-2.6
2007-10-13  David WoodhouseMerge branch 'master' of git://git./linux/kernel/git...
2007-10-13  Dmitry TorokhovMerge /pub/scm/linux/kernel/git/torvalds/linux-2.6
2007-10-12  Russell KingMerge branches 'omap1-upstream' and 'omap2-upstream...
2007-10-12  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/cpufreq
2007-10-12  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-10-12  Linus TorvaldsMerge git://git./linux/kernel/git/steve/gfs2-2.6-nmw
2007-10-12  Linus TorvaldsMerge branch 'master' of git://git./linux/kernel/git...
2007-10-12  Linus TorvaldsMerge branch 'upstream-fixes' of /linux/kernel/git...
2007-10-12  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-10-12  Linus TorvaldsMerge branch 'master' of git://git./linux/kernel/git...
2007-10-12  Linus TorvaldsMerge branch 'upstream' of git://ftp.linux-mips.org...
2007-10-12  Linus TorvaldsMerge git://git./linux/kernel/git/bart/ide-2.6
2007-10-12  Linus TorvaldsMerge branch 'for-linus' of git://git.o-hand.com/linux...
2007-10-12  Linus TorvaldsMerge branch 'for-linus' of git://git.o-hand.com/linux...
2007-10-12  Linus TorvaldsMerge branch 'dmi-const' of git://git./linux/kernel...
2007-10-12  Linus TorvaldsMerge branch 'block-2.6.24' of git://git.kernel.dk...
2007-10-10  Arnd Bergmanncompat_ioctl: move floppy handlers to block/compat_ioctl.c
2007-10-10  Arnd Bergmanncompat_ioctl: move cdrom handlers to block/compat_ioctl.c
2007-10-10  Arnd Bergmanncompat_ioctl: move BLKPG handling to block/compat_ioctl.c
2007-10-10  Arnd Bergmanncompat_ioctl: move hdio calls to block/compat_ioctl.c
2007-10-10  Arnd Bergmanncompat_ioctl: handle blk_trace ioctls
2007-10-10  Arnd Bergmanncompat_ioctl: add compat_blkdev_driver_ioctl()
2007-10-10  Arnd Bergmanncompat_ioctl: move common block ioctls to compat_blkdev...