| commit | f03683b8fb7e03862d2f1366a16c1b01732a5741 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Aug 04 16:44:04 2011 -1000 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Aug 04 16:44:04 2011 -1000 |
| tree | af8143877e0d56e6a8206d937027a1fd8d8a9ec1 | |
| parent | 7f3bf7cd348cead84f8027b32aa30ea49fa64df5 [diff] | |
| parent | 30765b92ada267c5395fc788623cb15233276f5c [diff] |
Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/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