Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 16 Sep 2009 14:46:34 +0000 (07:46 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 16 Sep 2009 14:46:34 +0000 (07:46 -0700)
commit6b7b352f2102e21f9d8f38e932f01d9c5705c073
tree189dc171c0de4754d6dcf96c1c68ce300b80e687
parenta3eb51ecfa1d7be689f05c9f12cb0fcf862c516e
parentcb684b5bcd6a79ae7e2360c6b158c4aa7b0a293a
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: fix linkage problem with blk_iopoll and !CONFIG_BLOCK