Merge branch 'upstream-fixes' into upstream
[linux-2.6] / drivers / parport / Kconfig
2006-03-21  Linus TorvaldsMerge branch 'origin'
2006-03-21  Tony LuckPull sn2-mmio-writes into release branch
2006-03-21  Tony LuckPull altix-ce1.0-asic into release branch
2006-03-21  Tony LuckPull sn-handle-sc-powerdown into release branch
2006-03-21  Tony LuckPull delete-sigdelayed into release branch
2006-03-21  Tony LuckPull sem2mutex-ioc4 into release branch
2006-03-21  Tony LuckPull ia64-mutex-primitives into release branch
2006-03-21  Tony LuckPull bsp-removal into release branch
2006-03-14  Dave KleikampMerge with /home/shaggy/git/linus-clean/
2006-03-02  Jeff GarzikMerge branch 'lro'
2006-02-24  Anton AltaparmakovMerge ../ntfs-2.6-devel
2006-02-24  Anton AltaparmakovMerge branch 'master' of /home/src/linux-2.6/
2006-02-21  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/agpgart
2006-02-14  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2006-02-14  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/cpufreq
2006-02-09  Jeff GarzikMerge branch 'net.b0' of git://git./linux/kernel/git...
2006-02-09  Jeff GarzikMerge branch 'upstream-fixes'
2006-02-09  Jeff GarzikMerge branch 'upstream-fixes'
2006-02-09  Jeff GarzikMerge branch 'master'
2006-02-07  Paul MackerrasMerge git://git./linux/kernel/git/paulus/powerpc
2006-02-07  Linus TorvaldsMerge git://git./linux/kernel/git/sam/kbuild-bugfix
2006-02-07  Mauro Carvalho ChehabMerge branch 'work-fixes'
2006-02-07  Jeff GarzikMerge branch 'for-jeff' of git://electric-eye.fr.zoreil...
2006-02-07  Jeff GarzikMerge branch 'sundance'
2006-02-07  Jeff GarzikMerge branch 'master'
2006-02-06  Linus TorvaldsMerge branch 'release' of git://git./linux/kernel/git...
2006-02-06  Paul MackerrasMerge ../linux-2.6
2006-02-06  Mauro Carvalho ChehabMerge branch 'origin'
2006-02-04  Linus TorvaldsMerge /pub/scm/linux/kernel/git/kyle/parisc-2.6
2006-02-03  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-serial
2006-02-03  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-mmc
2006-02-03  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2006-02-03  Linus TorvaldsMerge branch 'upstream-linus' of git://oss.oracle.com...
2006-02-03  Adrian BunkMerge ... git://git./linux/kernel/git/torvalds/linux...
2006-02-03  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davem/net-2.6
2006-02-03  Arnaud Giersch[PATCH] parport: add parallel port support for SGI O2
2006-02-01  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/x86
2006-01-27  Len BrownPull release into acpica branch
2006-01-24  Len Brown[ACPI] merge 3549 4320 4485 4588 4980 5483 5651 acpica...
2006-01-24  Dave KleikampMerge with /home/shaggy/git/linus-clean/
2006-01-19  Anton AltaparmakovMerge branch 'master' of /usr/src/ntfs-2.6/
2006-01-17  Jeff GarzikMerge branch 'upstream'
2006-01-14  Linus TorvaldsMerge /pub/scm/linux/kernel/git/dtor/input
2006-01-13  Linus TorvaldsMerge branch 'for-linus' of /linux/kernel/git/roland...
2006-01-12  Steve FrenchMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2006-01-12  Linus TorvaldsMerge branch 'drm-forlinus' of git://git./linux/kernel...
2006-01-12  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2006-01-12  Nathan ScottMerge HEAD from oss.sgi.com:/oss/git/linux-2.6.git
2006-01-11  Linus TorvaldsMerge git://git./linux/kernel/git/paulus/powerpc-merge
2006-01-11  Linus TorvaldsMerge /pub/scm/linux/kernel/git/kyle/parisc-2.6
2006-01-11  Guy Martin[PARISC] Fix parport_gsc by selecting PARPORT_NOT_PC
2006-01-10  Linus TorvaldsMerge git://git./linux/kernel/git/dtor/input
2006-01-10  Linus TorvaldsMerge ssh:///pub/scm/linux/kernel/git/sam/kbuild
2006-01-09  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-serial
2006-01-09  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-mmc
2006-01-09  Russell KingMerge Linus' tree.
2006-01-09  Linus TorvaldsMerge git://git./linux/kernel/git/paulus/powerpc-merge
2006-01-09  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2006-01-09  David Howells[PATCH] frv: suppress configuration of certain features...
2006-01-07  Linus TorvaldsMerge git://git./linux/kernel/git/dtor/input
2006-01-07  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-serial
2006-01-07  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-mmc
2006-01-07  Russell KingMerge with Linus' kernel.
2006-01-07  Len BrownPull pnpacpi into acpica branch
2006-01-06  Linus TorvaldsMerge git://git./linux/kernel/git/sam/kbuild
2006-01-06  Len BrownAuto-update from upstream
2006-01-06  Greg Kroah-HartmanMerge ../torvalds-2.6/
2006-01-06  Linus TorvaldsMerge branch 'post-2.6.15' of git://brick.kernel.dk...
2006-01-06  Adrian Bunk[PATCH] simplify PARPORT_PC_PCMCIA dependencies
2005-11-06  Thomas GleixnerMerge branch 'master' of /home/tglx/work/mtd/git/linux...
2005-09-14  Jeff GarzikMerge /spare/repo/linux-2.6/
2005-09-13  Linus TorvaldsMerge /pub/scm/linux/kernel/git/chrisw/lsm-2.6
2005-09-09  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/agpgart
2005-09-08  Linus TorvaldsMerge kernel.org:/home/rmk/linux-2.6-i2c manually
2005-09-08  James BottomleyMerge HEAD from ../scsi-iscsi-2.6
2005-09-06  James BottomleyMerge by hand (conflicts in sd.c)
2005-09-06  Linus TorvaldsMerge /pub/scm/linux/kernel/git/sam/kbuild
2005-09-04  Dmitry TorokhovMerge HEAD from /linux/kernel/git/torvalds/linux-2...
2005-08-31  Russell King[SERIAL] Clean up and fix tty transmission start/stoping
2005-08-30  Linus TorvaldsMerge refs/heads/for-linus from /linux/kernel/git/shagg...
2005-08-30  Linus TorvaldsMerge refs/heads/drm-latest from /linux/kernel/git...
2005-08-29  Jeff GarzikMerge /spare/repo/linux-2.6/
2005-08-29  Jeff GarzikMerge upstream kernel into libata 'passthru' branch
2005-08-29  Tony LuckPull ngam-maule-steiner into release branch
2005-08-29  Tony LuckPull swiotlb-size into release branch
2005-08-29  Tony LuckPull unaligned-snsc_event into release branch
2005-08-29  Jeff GarzikMerge /spare/repo/linux-2.6/
2005-08-29  Jeff Garzik/spare/repo/libata-dev branch 'v2.6.13'
2005-08-29  Jeff Garzik/spare/repo/netdev-2.6 branch 'sis190'
2005-08-29  Jeff Garzik/spare/repo/netdev-2.6 branch 'uli-tulip'
2005-08-29  Tony LuckPull lameter-rwsem-limit into release branch
2005-08-29  Tony LuckPull mm-context-fix into release branch
2005-08-29  Tony LuckPull lameter-spinlock-optimization into release branch
2005-08-29  Linus TorvaldsMerge HEAD from /home/rmk/linux-2.6-arm.git
2005-08-29  Linus TorvaldsMerge HEAD from /home/rmk/linux-2.6-mmc.git
2005-08-29  Linus TorvaldsMerge HEAD from /home/rmk/linux-2.6-serial.git
2005-08-29  Linus TorvaldsMerge HEAD from /home/rmk/linux-2.6-ucb.git
2005-08-28  James BottomleyMerge by hand (conflicts in sr.c)
2005-08-28  James BottomleyMerge HEAD from ../scsi-misc-2.6-tmp
2005-08-28  James Bottomleyfix mismerge in ll_rw_blk.c
next