[IA64] Manual merge fix for 3 files
[linux-2.6] / drivers / isdn / capi /
2005-09-06  James BottomleyMerge by hand (conflicts in sd.c)
2005-09-06  Linus TorvaldsMerge /pub/scm/linux/kernel/git/sam/kbuild
2005-09-01  Jeff Garzik/spare/repo/netdev-2.6 branch 'ieee80211'
2005-09-01  Jeff Garzik/spare/repo/netdev-2.6 branch 'master'
2005-08-31  Russell King[SERIAL] Clean up and fix tty transmission start/stoping
2005-08-30  Linus TorvaldsMerge refs/heads/for-linus from /linux/kernel/git/shagg...
2005-08-30  Linus TorvaldsMerge refs/heads/drm-latest from /linux/kernel/git...
2005-08-29  Tony LuckPull rationalise-regions into release branch
2005-08-29  Tony LuckPull ngam-maule-steiner into release branch
2005-08-29  Tony LuckPull pending-2.6.14 into release branch
2005-08-29  Tony LuckPull acpi-p-state into release branch
2005-08-29  Tony LuckPull asm-segment into release branch
2005-08-29  Tony LuckPull swiotlb-size into release branch
2005-08-29  Tony LuckPull unaligned-snsc_event into release branch
2005-08-29  Len BrownAuto-update from upstream
2005-08-29  Jeff GarzikMerge /spare/repo/linux-2.6/
2005-08-29  Jeff GarzikMerge /spare/repo/linux-2.6/
2005-08-29  Jeff Garzik/spare/repo/netdev-2.6 branch 'e100'
2005-08-29  Jeff Garzik/spare/repo/netdev-2.6 branch 'sis190'
2005-08-29  Jeff Garzik/spare/repo/netdev-2.6 branch 'uli-tulip'
2005-08-29  Tony LuckPull lameter-rwsem-limit into release branch
2005-08-29  Tony LuckPull mm-context-fix into release branch
2005-08-29  Tony LuckPull lameter-spinlock-optimization into release branch
2005-08-29  Linus TorvaldsMerge HEAD from /linux/kernel/git/roland/infiniband.git
2005-08-29  Linus TorvaldsMerge HEAD from /home/rmk/linux-2.6-arm.git
2005-08-29  Linus TorvaldsMerge HEAD from /home/rmk/linux-2.6-mmc.git
2005-08-29  Linus TorvaldsMerge HEAD from /home/rmk/linux-2.6-serial.git
2005-08-29  Linus TorvaldsMerge HEAD from /home/rmk/linux-2.6-ucb.git
2005-08-29  Linus TorvaldsMerge refs/heads/upstream from /linux/kernel/git/jgarzi...
2005-08-29  Linus TorvaldsMerge refs/heads/upstream from /linux/kernel/git/jgarzi...
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-28  Linus TorvaldsMerge refs/heads/upstream-fixes from /linux/kernel...
2005-08-27  James Morris[PATCH] Fix capifs bug in initialization error path.
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-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-23  Luming Yu/home/lenb/linux-2.6 branch 'acpi-2.6.12'
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-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  Anton AltaparmakovAutomatic merge with /usr/src/ntfs-2.6.git.
2005-06-23  Jeff GarzikMerge /spare/repo/linux-2.6/
2005-06-22  Linus TorvaldsMerge rsync://oss.sgi.com/git/xfs-2.6
2005-06-21  Tony LuckAuto merge with /home/aegl/GIT/linus
2005-06-21  Linus TorvaldsMerge 'for-linus' branch of /linux/kernel/git/shaggy...
2005-06-21  Jaroslav KyselaMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2005-06-20  Linus TorvaldsMerge /pub/scm/linux/kernel/git/gregkh/driver-2.6
2005-06-20  gregkh@suse.de[PATCH] class: convert drivers/* to use the new class...
2005-05-20  James Bottomleymerge by hand - fix up rejections in Documentation...
2005-05-17  Tony LuckMerge ... temp tree to get David's gdb inferior calls...
2005-05-06  Linus TorvaldsMerge ... parisc-linux.org/~jejb/git/scsi-for-linus...
2005-05-03  David WoodhouseMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2005-05-01  Adrian Bunk[PATCH] make lots of things static
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2