tree 917acaae9556ad2c372d001bf786cfbcf8102684
parent 160acc2e899f26356bde92bc257253b7ca78f0c3
parent 51fd77bd9f512ab6cc9df0733ba1caaab89eb957
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1194119016 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1194119016 -0700

Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
  [BLOCK] Don't allow empty barriers to be passed down to queues that don't grok them
  dm: bounce_pfn limit added
  Deadline iosched: Fix batching fairness
  Deadline iosched: Reset batch for ordered requests
  Deadline iosched: Factor out finding latter reques