Manual merge with Linus (conflict in drivers/input/misc/wistron_bnts.c)
[linux-2.6] / include / asm-s390 / system.h
2005-09-08  Linus TorvaldsMerge kernel.org:/home/rmk/linux-2.6-i2c manually
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-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-10  Jeff GarzikMerge /spare/repo/linux-2.6/
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  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  Len Brown/home/lenb/src/to-linus branch 'acpi-2.6.12'
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  Jeff GarzikMerge /spare/repo/netdev-2.6 branch 'ieee80211'
2005-07-13  Jeff GarzikMerge upstream 2.6.13-rc3 into ieee80211 branch of...
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-07  Dave AirlieMerge ../linux-2.6/
2005-07-06  Artem B. BityuckiyMerge with rsync://fileserver/linux
2005-07-04  Anton AltaparmakovAutomatic merge with /usr/src/ntfs-2.6.git.
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-07-01  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2005-07-01  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-serial
2005-06-30  Linus TorvaldsMerge /pub/scm/linux/kernel/git/gregkh/driver-2.6
2005-06-30  Linus TorvaldsMerge /pub/scm/linux/kernel/git/paulus/ppc64-2.6
2005-06-30  Heiko Carstens[PATCH] s390: fix finish_arch_switch
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-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  Anton AltaparmakovAutomatic merge with /usr/src/ntfs-2.6.git.
2005-06-26  Jeff GarzikMerge upstream (approx. 2.6.12-git8) into 'janitor...
2005-06-26  Linus TorvaldsMerge 'drm-3264' branch of /linux/kernel/git/airlied...
2005-06-26  Linus TorvaldsMerge 'drm-fixes' branch of /linux/kernel/git/airlied...
2005-06-26  Linus TorvaldsMerge Christoph's freeze cleanup patch
2005-06-25  Nick Piggin[PATCH] sched: cleanup context switch locking
2005-06-25  Heiko Carstens[PATCH] s390: improved machine check handling
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2