diff options
| author | Ingo Molnar <[email protected]> | 2012-03-26 15:18:44 +0000 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2012-03-26 15:19:03 +0000 |
| commit | 7fd52392c56361a40f0c630a82b36b95ca31eac6 (patch) | |
| tree | 14091de24c6b28ea4cae9826f98aeedb7be091f5 /lib/debugobjects.c | |
| parent | perf: Move mmap page data_head offset assertion out of header (diff) | |
| parent | Merge tag 'stable/for-linus-3.4-tag-two' of git://git.kernel.org/pub/scm/linu... (diff) | |
| download | kernel-7fd52392c56361a40f0c630a82b36b95ca31eac6.tar.gz kernel-7fd52392c56361a40f0c630a82b36b95ca31eac6.zip | |
Merge branch 'linus' into perf/urgent
Merge reason: we need to fix a non-trivial merge conflict.
Signed-off-by: Ingo Molnar <[email protected]>
Diffstat (limited to 'lib/debugobjects.c')
0 files changed, 0 insertions, 0 deletions