Merge by hand (conflicts in sr.c)
[linux-2.6] / include / asm-s390 / unistd.h
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-15  Len BrownMerge ../to-linus-stable/
2005-08-04  Dave KleikampMerge with /home/shaggy/git/linus-clean/
2005-08-04  Linus TorvaldsMerge /linux/kernel/git/jejb/scsi-for-linus-2.6
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-02  Martin Schwidefsky[PATCH] s390: ioprio & inotify system calls.
2005-07-30  Len Brown/home/lenb/src/to-linus branch 'acpi-2.6.12'
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-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-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  Heiko Carstens[PATCH] kexec: s390 support
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2