tree a0dd14e6d46efbb36a0898c158e8efb49e4a22ef
parent dc1d60a014aa9614518f9856ff661716d0969ffd
parent d6de8be711b28049a5cb93c954722c311c7d3f7f
author Linus Torvalds <torvalds@linux-foundation.org> 1211986851 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1211986851 -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:
  cfq-iosched: fix RCU problem in cfq_cic_lookup()
  block: make blktrace use per-cpu buffers for message notes
  Added in elevator switch message to blktrace stream
  Added in MESSAGE notes for blktraces
  block: reorder cfq_queue to save space on 64bit builds
  block: Move the second call to get_request to the end of the loop
  splice: handle try_to_release_page() failure
  splice: fix sendfile() issue with relay