Merge branch 'linus'
[linux-2.6] / include / asm-um / alternative.h
2006-03-24  Trond MyklebustMerge branch 'linus'
2006-03-24  Linus TorvaldsMerge /pub/scm/linux/kernel/git/mchehab/v4l-dvb
2006-03-23  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davem/net-2.6
2006-03-23  Linus TorvaldsMerge git://oss.sgi.com:8090/oss/git/xfs-2.6
2006-03-23  Jeff GarzikMerge branch 'upstream' of git://git./linux/kernel...
2006-03-23  Jeff GarzikMerge branch 'master'
2006-03-23  Anton AltaparmakovMerge branch 'master' of /usr/src/ntfs-2.6/
2006-03-23  Anton AltaparmakovMerge branch 'master' of /home/aia21/ntfs-2.6/
2006-03-23  Gerd Hoffmann[PATCH] x86: SMP alternatives