Merge by hand (conflicts in sr.c)
[powerpc.git] / include / asm-i386 / mach-visws / do_timer.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-10 Dave KleikampMerge with /home/shaggy/git/linus-clean/
2005-08-09 Linus TorvaldsMerge /pub/scm/linux/kernel/git/aegl/linux-2.6
2005-08-08 Linus TorvaldsMerge /pub/scm/linux/kernel/git/davem/net-2.6
2005-08-08 Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2005-08-07 Tom Duffy[PATCH] Make visws compile again
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2