Merge by Hand
[linux-2.6] / drivers / usb / input / touchkitusb.c
2005-11-05  James BottomleyMerge by Hand
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  Linus TorvaldsMerge /pub/scm/linux/kernel/git/airlied/drm-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  Paul MackerrasMerge ../linux-2.6 by hand
2005-10-30  Anton AltaparmakovMerge branch 'master' of /usr/src/ntfs-2.6/
2005-10-29  Linus TorvaldsMerge branch 'upstream-linus' of /linux/kernel/git...
2005-10-29  Linus TorvaldsMerge branch 'upstream-linus' of /linux/kernel/git...
2005-10-29  Arnaldo Carvalho... Merge branch 'master' of /linux/kernel/git/torvalds...
2005-10-29  Linus TorvaldsMerge branch 'release' of git://git./linux/kernel/git...
2005-10-29  Linus TorvaldsMerge /pub/scm/linux/kernel/git/gregkh/usb-2.6
2005-10-29  Arnaldo Carvalho... Merge /pub/scm/linux/kernel/git/sridhar/lksctp-2.6
2005-10-28  Daniel Ritz[PATCH] usb/input/touchkit: add more device IDs
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  Linus TorvaldsMerge /pub/scm/linux/kernel/git/gregkh/driver-2.6
2005-10-28  Greg KHMerge ../bleed-2.6
2005-10-28  Dmitry Torokhov[PATCH] drivers/usb/input: convert to dynamic input_dev...
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  Linus TorvaldsMerge /pub/scm/linux/kernel/git/sam/kbuild
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 '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-17  Jeff GarzikMerge /spare/repo/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-10  Jeff GarzikMerge /spare/repo/linux-2.6/
2005-08-09  David WoodhouseMerge with /shiny/git/linux-2.6/.git
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-08-03  Steve FrenchMerge ... /linux/kernel/git/torvalds/linux-2.6.git
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-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-11  Dmitry TorokhovMerge /pub/scm/linux/kernel/git/torvalds/linux-2.6
2005-07-06  Artem B. BityuckiyMerge with rsync://fileserver/linux
2005-07-02  David WoodhouseMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2005-07-01  Steve FrenchMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2005-06-30  Anton AltaparmakovAutomerge with /usr/src/ntfs-2.6.git.
2005-06-30  Dmitry TorokhovInput: introduce usb_to_input_id() to uniformly produce
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-06  Dmitry TorokhovMerge ... /linux/kernel/git/torvalds/linux-2.6
2005-06-01  Dmitry TorokhovMerge ... /linux/kernel/git/torvalds/linux-2.6
2005-05-29  Dmitry TorokhovInput: remove user counters from drivers/usb/input...
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2