tree 3f21850be8fe914ffc6ca581e98aea0871300b7c
parent facf014792093d95e308b5d6ce9bc86d3c90e5b1
parent a75ad3c27a6ad78c4306cac939938050dcde54f3
author Linus Torvalds <torvalds@g5.osdl.org> 1154139820 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1154139820 -0700

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