diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-18 17:07:51 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-18 17:07:51 +0100 |
| commit | 7f0f598a0069d1ab072375965a4b69137233169c (patch) | |
| tree | 00cb9320e0caef179d6075b54fa611de6551e3e2 /net/ipv4/ipmr.c | |
| parent | suspend: use WARN not WARN_ON to print the message (diff) | |
| parent | block: hold extra reference to bio in blk_rq_map_user_iov() (diff) | |
| download | linux-7f0f598a0069d1ab072375965a4b69137233169c.tar.xz linux-7f0f598a0069d1ab072375965a4b69137233169c.zip | |
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: hold extra reference to bio in blk_rq_map_user_iov()
relay: fix cpu offline problem
Release old elevator on change elevator
block: fix boot failure with CONFIG_DEBUG_BLOCK_EXT_DEVT=y and nash
block/md: fix md autodetection
block: make add_partition() return pointer to hd_struct
block: fix add_partition() error path
Diffstat (limited to 'net/ipv4/ipmr.c')
0 files changed, 0 insertions, 0 deletions