Manual merge with Linus
[pandora-kernel.git] / drivers / input / mouse / psmouse-base.c
2005-09-10 Dmitry TorokhovManual merge with Linus
2005-09-09 Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/cpufreq
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 Tony Luck[IA64] Manual merge fix for 3 files
2005-09-08 David S. MillerMerge git://git.skbuff.net/gitroot/yoshfuji/linux-2...
2005-09-08 Jeff GarzikMerge /spare/repo/linux-2.6/
2005-09-08 Len BrownMerge linux-2.6 with linux-acpi-2.6
2005-09-08 Linus TorvaldsMerge /linux/kernel/git/jejb/scsi-for-linus-2.6
2005-09-08 Linus TorvaldsMerge branch 'drm-fixes' of /linux/kernel/git/airlied...
2005-09-08 Linus TorvaldsMerge branch 'upstream' of /linux/kernel/git/jgarzik...
2005-09-08 Linus TorvaldsMerge branch 'upstream' of /linux/kernel/git/jgarzik...
2005-09-08 Linus TorvaldsMerge git://oss.sgi.com:8090/oss/git/xfs-2.6
2005-09-08 Linus TorvaldsMerge branch 'upstream' of /linux/kernel/git/jgarzik...
2005-09-08 Linus TorvaldsMerge /pub/scm/linux/kernel/git/davem/sparc-2.6
2005-09-08 Linus TorvaldsMerge /pub/scm/linux/kernel/git/davem/net-2.6
2005-09-08 Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-serial
2005-09-08 Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2005-09-07 Pekka Enberg[PATCH] input: convert kcalloc to kzalloc
2005-09-06 Linus TorvaldsMerge /pub/scm/linux/kernel/git/sam/kbuild
2005-09-04 Dmitry TorokhovInput: rework psmouse attributes to reduce module size
2005-09-04 Dmitry TorokhovMerge HEAD from /linux/kernel/git/torvalds/linux-2...
2005-08-29 Jeff GarzikMerge /spare/repo/linux-2.6/
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 Bottomleyfix mismerge in ll_rw_blk.c
2005-08-18 Dave JonesMerge /pub/scm/linux/kernel/git/torvalds/linux-2.6
2005-08-15 Len BrownMerge 'acpi-2.6.12' branch into to-akpm
2005-08-15 Len BrownMerge ../to-linus-stable/
2005-08-11 Len BrownMerge acpi-2.6.12 to-akpm
2005-08-08 Stephen EvanchikInput: psmouse - add support for IBM TrackPoint devices.
2005-08-05 Len Brown[ACPI] Merge acpi-2.6.12 branch into 2.6.13-rc3
2005-08-04 Len Brown/home/lenb/src/to-akpm branch 'acpi-2.6.12'
2005-08-04 Dave KleikampMerge with /home/shaggy/git/linus-clean/
2005-08-04 Linus TorvaldsMerge head 'for-linus' of /linux/kernel/git/roland...
2005-08-04 Len Brown/home/lenb/src/to-linus-stable branch 'acpi-2.6.12'
2005-08-03 Len Brown/home/lenb/src/to-linus branch 'acpi-2.6.12'
2005-07-30 Jeff Garzik/spare/repo/netdev-2.6 branch 'ieee80211'
2005-07-30 Jeff Garzik/spare/repo/netdev-2.6 branch 'master'
2005-07-30 Len Brownmerge 2.6.13-rc4 with ACPI's to-linus tree
2005-07-30 Dave AirlieMerge ../linux-2.6/
2005-07-30 Len Brown/home/lenb/src/to-linus branch 'acpi-2.6.12'
2005-07-29 Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/cpufreq
2005-07-29 Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/cpufreq
2005-07-29 Linus TorvaldsMerge /pub/scm/linux/kernel/git/dtor/input
2005-07-26 Linus TorvaldsMerge /linux/kernel/git/jejb/scsi-for-linus-2.6
2005-07-23 Luming Yu/home/lenb/linux-2.6 branch 'acpi-2.6.12'
2005-07-15 Vojtech PavlikInput: psmouse - wheel mice (imps, exps) always have...
2005-07-13 Dave KleikampMerge with /home/shaggy/git/linus-clean/
2005-07-12 Len Brown[ACPI] merge acpi-2.6.12 branch into latest Linux 2...
2005-07-06 Artem B. BityuckiyMerge with rsync://fileserver/linux
2005-06-30 Anton AltaparmakovAutomerge with /usr/src/ntfs-2.6.git.
2005-06-28 Tony LuckAuto merge with /home/aegl/GIT/ia64-test
2005-06-28 Russell King[PATCH] ARM SMP: TLB implementations only affect local CPU
2005-06-28 Greg KHMerge /pub/scm/linux/kernel/git/torvalds/linux-2.6
2005-06-28 Linus TorvaldsMerge /pub/scm/linux/kernel/git/davem/sparc-2.6
2005-06-28 Jeff GarzikMerge /spare/repo/netdev-2.6 branch 'ieee80211'
2005-06-28 Jeff GarzikMerge /spare/repo/linux-2.6/
2005-06-28 Jeff GarzikMerge upstream ieee80211.h with us (us == branch 'ieee8...
2005-06-27 Linus TorvaldsMerge /pub/scm/linux/kernel/git/gregkh/usb-2.6
2005-06-27 Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-serial
2005-06-27 Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2005-06-27 Linus TorvaldsMerge 'upstream' branch of /linux/kernel/git/jgarzik...
2005-06-27 Linus TorvaldsMerge 'upstream' branch of /linux/kernel/git/jgarzik...
2005-06-27 Linus TorvaldsMerge 'upstream' branch of /linux/kernel/git/jgarzik...
2005-06-27 Linus TorvaldsMerge /linux/kernel/git/dtor/input.git manually
2005-06-27 Jeff GarzikMerge /spare/repo/netdev-2.6/ branch 'ieee80211'
2005-06-27 Jeff GarzikMerge /spare/repo/linux-2.6/
2005-06-26 Jeff GarzikMerge /spare/repo/linux-2.6/
2005-06-26 Thomas GleixnerMerge with rsync://fileserver/linux
2005-06-26 Jeff GarzikMerge upstream (approx. 2.6.12-git8) into 'janitor...
2005-06-23 Jeff GarzikMerge /spare/repo/linux-2.6/
2005-06-21 Jaroslav KyselaMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2005-06-18 Russell KingMerge with ../linux-2.6-smp
2005-06-17 James Bottomleymerge by hand (fix up qla_os.c merge error)
2005-06-15 Tony LuckAuto merge with /home/aegl/GIT/linus
2005-06-06 Dmitry TorokhovMerge ... /linux/kernel/git/torvalds/linux-2.6
2005-06-04 <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch skge
2005-06-04 <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch starfire
2005-06-04 <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch smc91x
2005-06-04 <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch remove-drivers
2005-06-04 <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch iff-running
2005-06-04 <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch we18
2005-06-04 <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch viro
2005-06-04 <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch r8169
2005-06-04 <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch orinoco-hch
2005-06-04 <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch ppp
2005-06-04 <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch hdlc
2005-06-04 <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch dm9000
2005-06-04 <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch 8139too-iomap
2005-06-04 <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch 8139cp
2005-06-04 Linus TorvaldsAutomatic merge of 'misc-fixes' branch from
2005-06-04 <jgarzik@pretzel... Merge ... /spare/repo/libata-dev branch svw
2005-06-04 <jgarzik@pretzel... Merge ... /spare/repo/linux-2.6/.git branch HEAD
2005-06-04 <jgarzik@pretzel... Merge ... /spare/repo/linux-2.6/.git branch HEAD
2005-06-03 Linus TorvaldsMerge ... parisc-linux.org/~jejb/git/scsi-for-linus-2.6
2005-06-02 <jgarzik@pretzel... Merge ... /spare/repo/linux-2.6/.git branch HEAD
2005-06-02 Dave KleikampMerge with /home/shaggy/git/linus-clean/
2005-06-02 David WoodhouseMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2005-06-01 Linus TorvaldsMerge ... /linux/kernel/git/sfrench/cifs-2.6
next