diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-02 20:54:37 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-02 20:54:37 (GMT) |
| commit | 1a45dcfe2525e9432cb4aba461d4994fc2befe42 (patch) | |
| tree | 9df1443950d3bf64de2efd23878065b0a4760f61 /drivers/net/can/dev.c | |
| parent | 02b709df817c0db174f249cc59e5f7fd01b64d92 (diff) | |
| parent | 1efe8fe1c2240acc476bed77740883df63373862 (diff) | |
| download | linux-fsl-qoriq-1a45dcfe2525e9432cb4aba461d4994fc2befe42.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
cfq-iosched: Do not idle on async queues
blk-cgroup: Fix potential deadlock in blk-cgroup
block: fix bugs in bio-integrity mempool usage
block: fix bio_add_page for non trivial merge_bvec_fn case
drbd: null dereference bug
drbd: fix max_segment_size initialization
Diffstat (limited to 'drivers/net/can/dev.c')
0 files changed, 0 insertions, 0 deletions