Manual merge of for-linus to upstream (fix conflicts in drivers/infiniband/core/ucm.c)
[linux-2.6] / drivers / video / sis /
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-13  Linus TorvaldsMerge /linux/kernel/git/jejb/scsi-for-linus-2.6
2005-09-12  Greg KHMerge ../torvalds-2.6/
2005-09-12  Greg KHMerge ../torvalds-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 /pub/scm/linux/kernel/git/roland/infiniband
2005-09-11  Linus TorvaldsMerge branch 'for-linus' from /.../shaggy/jfs-2.6 manually
2005-09-10  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-serial
2005-09-10  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2005-09-10  David S. MillerMerge git://git.skbuff.net/gitroot/yoshfuji/linux-2...
2005-09-10  David S. MillerMerge /pub/scm/linux/kernel/git/acme/net-2.6
2005-09-10  Dmitry TorokhovManual merge with Linus
2005-09-09  Linus TorvaldsMerge /pub/scm/linux/kernel/git/sam/kbuild
2005-09-09  Linus TorvaldsMerge /pub/scm/linux/kernel/git/gregkh/pci-2.6
2005-09-09  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davem/net-2.6
2005-09-09  Thomas Winischhofer[PATCH] sisfb update
2005-06-15  Tony LuckAuto merge with /home/aegl/GIT/linus
2005-06-02  Dave KleikampMerge with /home/shaggy/git/linus-clean/
2005-05-21  Anton AltaparmakovMerge with /usr/src/ntfs-2.6.git
2005-05-20  James Bottomleymerge by hand - fix up rejections in Documentation...
2005-05-06  Linus TorvaldsMerge ... parisc-linux.org/~jejb/git/scsi-for-linus...
2005-05-05  Adrian Bunk[PATCH] make some things static
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2