Manual merge of for-linus to upstream (fix conflicts in drivers/infiniband/core/ucm.c)
[linux-2.6] / scripts / setlocalversion
2005-09-13  Linus TorvaldsMerge /pub/scm/linux/kernel/git/chrisw/lsm-2.6
2005-09-13  Linus TorvaldsMerge /pub/scm/linux/kernel/git/dwmw2/audit-2.6
2005-09-11  Tony LuckPull sn-features into release branch
2005-09-11  Tony LuckPull sim-fixes into release branch
2005-09-11  Linus TorvaldsMerge branch 'for-linus' from /.../shaggy/jfs-2.6 manually
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  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 git://oss.sgi.com:8090/oss/git/xfs-2.6
2005-09-06  Linus TorvaldsMerge /pub/scm/linux/kernel/git/paulus/ppc64-2.6
2005-09-06  Linus TorvaldsMerge branch 'upstream' of /linux/kernel/git/jgarzik...
2005-09-06  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2005-09-06  Linus TorvaldsMerge /pub/scm/linux/kernel/git/sam/kbuild
2005-08-10  Ryan Anderson[PATCH] kbuild: automatically append a short string...