diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-18 11:07:51 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-18 11:07:51 -0500 |
| commit | 7f0f598a0069d1ab072375965a4b69137233169c (patch) | |
| tree | 00cb9320e0caef179d6075b54fa611de6551e3e2 /net/mac80211/mlme.c | |
| parent | a6a0c4ca7edb378a8a7332501f097089cb1051c4 (diff) | |
| parent | c26156b2534c75bb3cdedf76f6ad1340971cf5bd (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: 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/mac80211/mlme.c')
0 files changed, 0 insertions, 0 deletions