Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 5 Aug 2011 02:44:04 +0000 (16:44 -1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 5 Aug 2011 02:44:04 +0000 (16:44 -1000)
commitf03683b8fb7e03862d2f1366a16c1b01732a5741
treeaf8143877e0d56e6a8206d937027a1fd8d8a9ec1
parent7f3bf7cd348cead84f8027b32aa30ea49fa64df5
parent30765b92ada267c5395fc788623cb15233276f5c
Merge branch 'core-urgent-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  slab, lockdep: Annotate the locks before using them
  lockdep: Clear whole lockdep_map on initialization
  slab, lockdep: Annotate slab -> rcu -> debug_object -> slab
  lockdep: Fix up warning
  lockdep: Fix trace_hardirqs_on_caller()
  futex: Fix regression with read only mappings