diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-16 07:46:34 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-16 07:46:34 -0700 |
| commit | 6b7b352f2102e21f9d8f38e932f01d9c5705c073 (patch) | |
| tree | 189dc171c0de4754d6dcf96c1c68ce300b80e687 /arch/sparc/include/asm/upa.h | |
| 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
Diffstat (limited to 'arch/sparc/include/asm/upa.h')
0 files changed, 0 insertions, 0 deletions