Merge branch 'master' into for-2.6.33

This commit is contained in:
Jens Axboe
2009-12-03 13:49:39 +01:00
966 changed files with 15377 additions and 7229 deletions
+1 -1
View File
@@ -41,7 +41,7 @@ struct rw_semaphore {
#endif
#define __RWSEM_INITIALIZER(name) \
{ RWSEM_UNLOCKED_VALUE, SPIN_LOCK_UNLOCKED, \
{ RWSEM_UNLOCKED_VALUE, __SPIN_LOCK_UNLOCKED((name).wait_lock), \
LIST_HEAD_INIT((name).wait_list) \
__RWSEM_DEP_MAP_INIT(name) }