From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 22 Jul 2009 17:06:33 +0000 (-0700)
Subject: Merge branch 'tj-block-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=bb184d11ffd015e67e5334e5a88bec2e00be5c20;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'tj-block-for-linus' of git://git./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
---

bb184d11ffd015e67e5334e5a88bec2e00be5c20