Manual merge with Linus (conflict in drivers/input/misc/wistron_bnts.c)
[linux-2.6] / include / asm-arm / arch-s3c2410 /
2005-12-02  Linus TorvaldsMerge /linux/kernel/git/jejb/scsi-rc-fixes-2.6
2005-12-01  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2005-11-30  Steve FrenchMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2005-11-28  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-serial
2005-11-28  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-mmc
2005-11-28  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2005-11-28  Lucas Correia Vill... [ARM] 3178/1: S3C2400 - adds GPIO registers definitions...
2005-11-21  David S. MillerMerge git://git.skbuff.net/gitroot/yoshfuji/linux-2...
2005-11-15  Linus TorvaldsMerge x86-64 update from Andi
2005-11-12  Linus TorvaldsMerge git://git./linux/kernel/git/bunk/trivial
2005-11-11  Jeff GarzikMerge branch 'atmel'
2005-11-10  Linus TorvaldsMerge /pub/scm/linux/kernel/git/sam/kbuild
2005-11-10  Linus TorvaldsMerge branch 'for-linus' of /linux/kernel/git/roland...
2005-11-10  Tony LuckPull add-mmio-to-proc-iomem into release branch
2005-11-10  Tony LuckPull context-bitmap into release branch
2005-11-10  Tony LuckPull extend-notify-die into release branch
2005-11-10  Tony LuckPull memoryless-node-allocation into release branch
2005-11-10  Tony LuckPull mca-check-psp into release branch
2005-11-10  Tony LuckPull align-sig-frame into release branch
2005-11-10  James BottomleyMerge by hand (whitespace conflicts in libata.h)
2005-11-10  Paul MackerrasMerge git://oak/home/sfr/kernels/iseries/work
2005-11-10  Paul MackerrasMerge ../linux-2.6
2005-11-09  Steve FrenchMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2005-11-09  Linus TorvaldsMerge /pub/scm/linux/kernel/git/gregkh/i2c-2.6
2005-11-09  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2005-11-09  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/agpgart
2005-11-09  Linus TorvaldsMerge branch 'upstream-linus' of /linux/kernel/git...
2005-11-09  Linus TorvaldsMerge branch 'release' of git://git./linux/kernel/git...
2005-11-09  Russell KingMerge with ARM SMP tree
2005-11-09  Jeff GarzikMerge branch 'master'
2005-11-09  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-serial
2005-11-08  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2005-11-08  Russell KingMerge with ARM SMP tree
2005-11-08  Ben Dooks[ARM] 3132/1: S3C2410 - reset on decompression error
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-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-05  Linus TorvaldsMerge /linux/kernel/git/paulus/powerpc-merge
2005-11-04  Linus TorvaldsMerge git://oss.sgi.com:8090/oss/git/xfs-2.6
2005-11-03  Tony LuckAuto-update from upstream
2005-11-03  Linus TorvaldsMerge branch 'swiotlb' of git://git./linux/kernel/git...
2005-11-02  Linus TorvaldsMerge git://brick.kernel.dk/data/git/linux-2.6-block
2005-11-02  Linus TorvaldsMerge /pub/scm/linux/kernel/git/airlied/drm-2.6
2005-11-02  Linus TorvaldsMerge /pub/scm/linux/kernel/git/acme/net-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-01  Ben Dooks[ARM] 3077/1: S3C2410 - regs-iis.h missing mask for...
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 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  Jeff GarzikMerge branch 'master'
2005-10-29  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2005-10-29  Nicolas Pitre[ARM] 3060/1: allow constants found in asm/memory.h...
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 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  Arnaldo Carvalho... Merge /linux/kernel/git/holtmann/bluetooth-2.6
2005-10-28  Greg KHMerge ../bleed-2.6
2005-10-28  Linus TorvaldsMerge branch 'forlinus' of git://parisc-linux.org/home...
2005-10-28  James BottomleyMerge HEAD from ../scsi-misc-2.6-old
2005-10-28  Jeff GarzikMerge branch 'master'
2005-10-28  Jeff GarzikMerge branch 'master'
2005-10-28  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-mmc
2005-10-28  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2005-10-28  Ben Dooks[ARM] 3045/2: S3C2410 - change init for lcd platform...
2005-10-28  Ben Dooks[ARM] 3033/1: S3C2410 - add generic gpio_cfgpin options
2005-10-28  Russell King[ARM] 1/4: Move include of asm/hardware.h to asm-arm...
2005-10-27  Trond MyklebustMerge /home/trondmy/scm/kernel/git/torvalds/linux-2.6
2005-10-27  Steve FrenchMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2005-10-26  Jeff GarzikMerge branch 'master'
2005-10-26  Jeff GarzikMerge branch 'master'
2005-10-24  Roland DreierManual merge of for-linus to upstream (fix conflicts...
2005-10-24  Anton AltaparmakovMerge branch 'master' of /usr/src/ntfs-2.6/
2005-10-24  Roland DreierMerge /pub/scm/linux/kernel/git/torvalds/linux-2.6
2005-10-24  Linus TorvaldsMerge /linux/kernel/git/jejb/scsi-for-linus-2.6
next