fix mismerge in ll_rw_blk.c
[linux-2.6] / drivers / sbus / char / vfc_dev.c
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-05  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davem/net-2.6
2005-08-05  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davem/sparc-2.6
2005-08-04  Christoph Hellwig[SPARC]: Fix up sleep_on() removal in vfc driver.
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2