diff options
author | 2011-09-18 14:01:26 +0200 | |
---|---|---|
committer | 2011-09-18 14:01:39 +0200 | |
commit | bfa322c48dc69bfdaee10faf3bd8dbc23b39a21c (patch) | |
tree | 95360c5d253115003080264d878f3c0f907f2978 /drivers/base/devres.c | |
parent | sched: Add documentation for bandwidth control (diff) | |
parent | lib/sha1.c: quiet sparse noise about symbol not declared (diff) | |
download | linux-dev-bfa322c48dc69bfdaee10faf3bd8dbc23b39a21c.tar.xz linux-dev-bfa322c48dc69bfdaee10faf3bd8dbc23b39a21c.zip |
Merge branch 'linus' into sched/core
Merge reason: We are queueing up a dependent patch.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/base/devres.c')
-rw-r--r-- | drivers/base/devres.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/base/devres.c b/drivers/base/devres.c index cf7a0c788052..65cd74832450 100644 --- a/drivers/base/devres.c +++ b/drivers/base/devres.c @@ -397,6 +397,7 @@ static int remove_nodes(struct device *dev, static int release_nodes(struct device *dev, struct list_head *first, struct list_head *end, unsigned long flags) + __releases(&dev->devres_lock) { LIST_HEAD(todo); int cnt; |