diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-25 10:38:18 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-25 10:38:18 -0700 |
| commit | 8ded371f81fba8b38a049f8c5f30ce6438fc7b75 (patch) | |
| tree | 0684d176cb6f35c92c4bf0185b1af9f5380077eb /crypto/cast5.c | |
| parent | 096a705bbc080a4041636d07514560da8d78acbe (diff) | |
| parent | 07d0c38e7d84f911c72058a124c7f17b3c779a65 (diff) | |
Merge branch 'for-3.1/drivers' of git://git.kernel.dk/linux-block
* 'for-3.1/drivers' of git://git.kernel.dk/linux-block:
cciss: do not attempt to read from a write-only register
xen/blkback: Add module alias for autoloading
xen/blkback: Don't let in-flight requests defer pending ones.
bsg: fix address space warning from sparse
bsg: remove unnecessary conditional expressions
bsg: fix bsg_poll() to return POLLOUT properly
Diffstat (limited to 'crypto/cast5.c')
0 files changed, 0 insertions, 0 deletions