| commit | 6b7b352f2102e21f9d8f38e932f01d9c5705c073 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Sep 16 07:46:34 2009 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Sep 16 07:46:34 2009 -0700 |
| tree | 189dc171c0de4754d6dcf96c1c68ce300b80e687 | |
| parent | a3eb51ecfa1d7be689f05c9f12cb0fcf862c516e [diff] | |
| parent | cb684b5bcd6a79ae7e2360c6b158c4aa7b0a293a [diff] |
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