Merge branch 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block
authorLinus Torvalds <torvalds@g5.osdl.org>
Sat, 29 Jul 2006 02:23:40 +0000 (19:23 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 29 Jul 2006 02:23:40 +0000 (19:23 -0700)
commit16585e76a71b64d75a090148c2a94bd4d50a5544
tree3f21850be8fe914ffc6ca581e98aea0871300b7c
parentfacf014792093d95e308b5d6ce9bc86d3c90e5b1
parenta75ad3c27a6ad78c4306cac939938050dcde54f3
Merge branch 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block

* 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block:
  [PATCH] scsi: kill overeager "not-ready" messages
  [PATCH] it821x: fix ide dma setup bug
  [PATCH] ide: if the id fields looks screwy, disable DMA
  [PATCH] ide: option to disable cache flushes for buggy drives