tree 8731a6d387158445ff3590e48842b7c097e0dcd6
parent 3c3301083e3bea4d14c597106c7b20b4b85fc03d
parent 023d43c7b5a23a81fe8afa9f37296f8ed4be11fb
author Linus Torvalds <torvalds@linux-foundation.org> 1248306258 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1248306258 -0700

Merge branch 'lockdep-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/peterz/linux-2.6-lockdep

* 'lockdep-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/peterz/linux-2.6-lockdep:
  lockdep: Fix lockdep annotation for pipe_double_lock()