tree 367ee0d4edd1c463de91e80024cc488e76b34900
parent 1f9758d4e7b3d5db638c728b54de2faa2a01f292
parent 4fbfff76079a5c0e1751b0ddf53160d33f7831e7
author Linus Torvalds <torvalds@linux-foundation.org> 1248282393 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1248282393 -0700

Merge branch 'tj-block-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc

* 'tj-block-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc:
  virtio_blk: mark virtio_blk with __refdata to kill spurious section mismatch
  block: sysfs fix mismatched queue_var_{store,show} in 64bit kernel
  ataflop: adjust NULL test
  block: fix failfast merge testing in elv_rq_merge_ok()
  z2ram: Small cleanup for z2ram.c