[XFS] Fix merge failures
[pandora-kernel.git] / include / linux / bsg.h
2008-07-10 Russell KingMerge branches 'at91', 'dyntick', 'ep93xx', 'iop',...
2008-07-03 Russell KingMerge branch 'fb' into devel
2008-05-07 Russell KingMerge branch 'irq-fix' of git://modarm9.com/gitsrc...
2008-05-06 Jiri KosinaMerge branch 'master' of git://git./linux/kernel/git...
2008-05-03 Linus TorvaldsMerge git://git.infradead.org/battery-2.6
2008-05-01 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-05-01 Linus TorvaldsMerge git://git.infradead.org/mtd-2.6
2008-05-01 Linus TorvaldsMerge branch 'release' of git://lm-sensors.org/kernel...
2008-05-01 David S. MillerMerge branch 'master' of /linux/kernel/git/linville...
2008-05-01 Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-04-30 Len BrownMerge branches 'release', 'acpica', 'bugzilla-10224...
2008-04-30 Linus TorvaldsMerge git://git./linux/kernel/git/davem/sparc-2.6
2008-04-30 Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-04-30 Paul MackerrasMerge git://git./pub/scm/linux/kernel/git/jk/spufs
2008-04-29 Russell KingMerge branch 'orion-fixes2'
2008-04-29 Russell KingMerge branches 'pxa' and 'orion-fixes1'
2008-04-29 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-04-29 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-04-28 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-04-28 Linus TorvaldsMerge git://git./linux/kernel/git/davem/sparc-2.6
2008-04-28 Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-04-28 Linus TorvaldsMerge git://git./linux/kernel/git/tglx/linux-2.6-hrt
2008-04-28 Steve FrenchMerge branch 'master' of /linux/kernel/git/torvalds...
2008-04-27 Linus TorvaldsMerge git://git./linux/kernel/git/jejb/scsi-misc-2.6
2008-04-27 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-04-25 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-04-25 Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-04-25 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-04-24 Trond MyklebustMerge branch 'devel'
2008-04-24 Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-04-24 Linus TorvaldsMerge branch 'fixes' of /home/rmk/linux-2.6-arm
2008-04-24 Steve FrenchMerge branch 'master' of /linux/kernel/git/torvalds...
2008-04-24 Paul MackerrasMerge branch 'powerpc-next' of /linux/kernel/git/galak...
2008-04-23 Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-04-23 David WoodhouseMerge git://git.infradead.org/~dedekind/ubi-2.6
2008-04-22 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-04-22 Linus TorvaldsMerge branch 'for_linus' of git://git./linux/kernel...
2008-04-22 FUJITA Tomonori[SCSI] bsg: add release callback support
2008-04-22 David WoodhouseMerge branch 'master' of git://git./linux/kernel/git...
2008-04-22 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-04-22 Linus TorvaldsMerge git://git./linux/kernel/git/davem/sparc-2.6
2008-04-21 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-04-21 Linus TorvaldsMerge branch 'for-2.6.26' of git://git.kernel.dk/linux...
2008-04-21 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-04-21 Linus TorvaldsMerge git://git./linux/kernel/git/gregkh/pci-2.6
2008-04-21 Linus TorvaldsMerge git://git./linux/kernel/git/herbert/crypto-2.6
2008-04-21 Linus TorvaldsMerge branch 'irq-cleanups-upstream' of git://git....
2008-04-21 Linus TorvaldsMerge branch 'isdn-cleanups' of git://git./linux/kernel...
2008-04-21 Linus TorvaldsMerge branch 'master' of git://git./linux/kernel/git...
2008-04-21 Linus TorvaldsMerge git://git./linux/kernel/git/gregkh/driver-2.6
2008-04-20 Tony JonesSCSI: convert struct class_device to struct device
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-08-25 Linus TorvaldsMerge branch 'agp-patches' of git://git./linux/kernel...
2007-08-25 Linus TorvaldsMerge branch 'drm-patches' of git://git./linux/kernel...
2007-08-23 David WoodhouseMerge branch 'master' of git://git./linux/kernel/git...
2007-08-18 Linus TorvaldsMerge /pub/scm/linux/kernel/git/lethal/sh-2.6.23
2007-08-18 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-08-18 Linus TorvaldsMerge git://git./linux/kernel/git/sfrench/cifs-2.6
2007-08-12 Len BrownPull sbs into release branch
2007-08-12 Len BrownPull processor into release branch
2007-08-12 Len BrownPull ec into release branch
2007-08-12 Len BrownPull bugzilla-8768 into release branch
2007-08-12 Len BrownPull bugzilla-3774 into release branch
2007-08-12 Len Brownpull asus sony thinkpad into release branch
2007-08-08 David S. MillerMerge branch 'fixes-davem' of /linux/kernel/git/linvill...
2007-08-07 Jeff GarzikMerge branch 'r8169-for-jeff-20070806' of git://electri...
2007-08-07 Jeff GarzikMerge branch 'fixes-jgarzik' of git://git./linux/kernel...
2007-08-07 Jeff GarzikMerge branch 'ucc_geth' of /linux/kernel/git/leo/fsl...
2007-08-07 Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2007-08-07 Linus TorvaldsMerge git://git./linux/kernel/git/herbert/crypto-2.6
2007-08-07 Linus TorvaldsMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2007-08-07 Linus TorvaldsMerge branch 'master' of /linux/kernel/git/davem/sparc-2.6
2007-08-07 Linus TorvaldsMerge /linux/kernel/git/jejb/scsi-rc-fixes-2.6
2007-08-03 Linus TorvaldsMerge git://git.infradead.org/battery-2.6
2007-08-01 David WoodhouseMerge branch 'master' of git://git./linux/kernel/git...
2007-08-01 Linus TorvaldsMerge git://git./linux/kernel/git/wim/linux-2.6-watchdog
2007-07-31 FUJITA Tomonori[SCSI] bsg: update sg_io_v4 structure
2007-07-31 Linus TorvaldsMerge /pub/scm/linux/kernel/git/lethal/sh-2.6.23
2007-07-30 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-07-30 Linus TorvaldsMerge /linux/kernel/git/jejb/scsi-rc-fixes-2.6
2007-07-25 Len BrownPull d-states into release branch
2007-07-24 James Bottomley[SCSI] bsg: fix unused variable warnings for BLK_DEV_BSG=n
2007-07-23 FUJITA Tomonori[SCSI] bsg: use lib/idr.c to find a unique minor number
2007-07-23 David WoodhouseMerge branch 'master' of git://git./linux/kernel/git...
2007-07-22 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-07-22 Linus TorvaldsMerge /pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
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
next