Merge by hand (whitespace conflicts in libata.h)
[linux-2.6] / drivers / video / sa1100fb.c
2005-11-09  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2005-11-09  Jeff GarzikMerge branch 'master'
2005-11-09  Jeff GarzikMerge rsync://bughost.org/repos/ipw-delta/
2005-11-09  Jeff GarzikMerge rsync://bughost.org/repos/ieee80211-delta/
2005-11-08  James BottomleyMerge by hand (conflicts between pending drivers and...
2005-11-08  Jeff GarzikMerge git://git.tuxdriver.com/git/netdev-jwl
2005-11-08  Jeff GarzikMerge branch 'master'
2005-11-08  Paul MackerrasMerge ../linux-2.6
2005-11-07  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-mmc
2005-11-07  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2005-11-07  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/cpufreq
2005-11-07  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/agpgart
2005-11-07  Linus TorvaldsMerge branch 'upstream' of git://ftp.linux-mips.org...
2005-11-07  Linus TorvaldsMerge /pub/scm/linux/kernel/git/dtor/input
2005-11-07  Linus TorvaldsMerge /pub/scm/linux/kernel/git/tglx/mtd-2.6
2005-11-07  Tony LuckAuto-update from upstream
2005-11-07  Linus TorvaldsMerge /pub/scm/linux/kernel/git/bunk/trivial
2005-11-07  Linus TorvaldsMerge branch 'block-dir' of git://brick.kernel.dk/data...
2005-11-07  Linus TorvaldsMerge /pub/scm/linux/kernel/git/perex/alsa
2005-11-07  Linus TorvaldsMerge /pub/scm/linux/kernel/git/acme/net-2.6
2005-11-07  Linus TorvaldsMerge branch 'upstream-linus' of /linux/kernel/git...
2005-11-07  Antonino A. Daplas[PATCH] fbcon/fbdev: Move softcursor out of fbdev to...
2005-11-06  Thomas GleixnerMerge branch 'master' of /home/tglx/work/mtd/git/linux...
2005-11-05  Jeff GarzikMerge branch 'master'
2005-11-05  James BottomleyMerge by Hand
2005-11-05  Jeff GarzikMerge branch 'master'
2005-11-05  Linus TorvaldsMerge branch 'srp' of /linux/kernel/git/roland/infiniband
2005-11-05  Linus TorvaldsMerge branch 'for-linus' of /linux/kernel/git/roland...
2005-11-02  Stephen RothwellMerge Paulus' tree
2005-11-02  Linus TorvaldsMerge /pub/scm/linux/kernel/git/airlied/drm-2.6
2005-11-02  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-serial
2005-11-02  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2005-11-02  Paul MackerrasMerge ../linux-2.6
2005-11-01  Anton AltaparmakovMerge branch 'master' of /home/src/linux-2.6/
2005-10-31  Tony Luckmanual update from upstream:
2005-10-31  Steve FrenchMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2005-10-31  Linus TorvaldsMerge git://git./linux/kernel/git/aia21/ntfs-2.6
2005-10-31  Linus TorvaldsMerge branch 'upstream-linus' of /linux/kernel/git...
2005-10-31  Linus TorvaldsMerge kernel.org:/home/rmk/linux-2.6-drvmodel
2005-10-31  Paul MackerrasMerge ../linux-2.6 by hand
2005-10-30  Anton AltaparmakovMerge branch 'master' of /usr/src/ntfs-2.6/
2005-10-29  Russell KingCreate platform_device.h to contain all the platform...
2005-10-29  Linus TorvaldsMerge branch 'release' of git://git./linux/kernel/git...
2005-10-29  Arnaldo Carvalho... Merge /pub/scm/linux/kernel/git/sridhar/lksctp-2.6
2005-10-29  Jeff GarzikMerge branch 'upstream'
2005-10-28  Roland DreierMerge /pub/scm/linux/kernel/git/torvalds/linux-2.6
2005-10-28  Jeff GarzikMerge branch 'master'
2005-10-28  Jeff GarzikMerge branch 'master'
2005-10-28  Tony LuckPull xpc-disengage into release branch
2005-10-28  Tony LuckPull sparsemem-v5 into release branch
2005-10-28  Tony LuckPull remove-sn-bist-lock into release branch
2005-10-28  Tony LuckPull new-efi-memmap into release branch
2005-10-28  Tony LuckPull define-node-cleanup into release branch
2005-10-28  Tony LuckPull sn_pci_legacy_read-write into release branch
2005-10-28  Tony LuckPull acpi-produce-consume into release branch
2005-10-28  Tony LuckPull update-default-configs into release branch
2005-10-28  Tony LuckPull move-iosapic-to-acpi into release branch
2005-10-28  Linus TorvaldsMerge /pub/scm/linux/kernel/git/gregkh/driver-2.6
2005-10-28  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2005-10-28  Tony LuckPull ar-k0-usage into release branch
2005-10-28  Tony LuckPull 1024-cpu into release branch
2005-10-28  Tony LuckPull hp-machvec into release branch
2005-10-28  Tony LuckPull altix-mmr into release branch
2005-10-28  Tony LuckPull altix-fpga-reset into release branch
2005-10-28  Greg KHMerge ../bleed-2.6
2005-10-28  Russell King[PATCH] DRIVER MODEL: Get rid of the obsolete tri-level...
2005-10-28  James BottomleyMerge HEAD from ../scsi-misc-2.6-old
2005-10-22  Paul MackerrasMerge changes from linux-2.6 by hand
2005-10-21  Steve FrenchMerge ... /linux/kernel/git/sfrench/cifs-2.6.git/
2005-10-20  Tony LuckUpdate from upstream with manual merge of Yasunori...
2005-10-20  Dave Airliemerge Linus head tree into my drm tree and fix up conflicts
2005-10-19  Jeff GarzikMerge branch 'upstream'
2005-10-18  Jeff GarzikMerge branch 'upstream'
2005-10-18  Trond MyklebustMerge branch 'master' of ssh://linux-nfs.org/home/trond...
2005-10-18  Jeff GarzikMerge branch 'master'
2005-10-18  Jeff GarzikMerge branch 'master'
2005-10-18  Trond MyklebustMerge /home/trondmy/scm/kernel/git/torvalds/linux-2.6
2005-10-17  Anton AltaparmakovMerge branch 'master' of /usr/src/ntfs-2.6/
2005-10-15  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davem/sparc-2.6
2005-10-15  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-serial
2005-10-15  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2005-10-15  Pavel Machek[PATCH] zaurus: fix compilation with cpufreq disabled
2005-09-13  Linus TorvaldsMerge /pub/scm/linux/kernel/git/chrisw/lsm-2.6
2005-09-08  Linus TorvaldsMerge kernel.org:/home/rmk/linux-2.6-i2c manually
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/drm-latest from /linux/kernel/git...
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  Linus TorvaldsMerge HEAD from /home/rmk/linux-2.6-serial.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
2005-08-18  Dave JonesMerge /pub/scm/linux/kernel/git/torvalds/linux-2.6
2005-08-17  Jeff GarzikMerge /spare/repo/linux-2.6/
2005-08-15  Len BrownMerge 'acpi-2.6.12' branch into to-akpm
next