tree 189dc171c0de4754d6dcf96c1c68ce300b80e687
parent a3eb51ecfa1d7be689f05c9f12cb0fcf862c516e
parent cb684b5bcd6a79ae7e2360c6b158c4aa7b0a293a
author Linus Torvalds <torvalds@linux-foundation.org> 1253112394 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1253112394 -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: fix linkage problem with blk_iopoll and !CONFIG_BLOCK