diff options
author | Ingo Molnar <mingo@elte.hu> | 2010-11-18 02:07:36 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2010-11-18 02:07:36 -0500 |
commit | a89d4bd055718d3b4ddb380ee22951a1300b4096 (patch) | |
tree | ca7a040a619f7c1fb6a42e77be7ff9147417aa2b /include/linux/nmi.h | |
parent | e53beacd23d9cb47590da6a7a7f6d417b941a994 (diff) | |
parent | 91e86e560d0b3ce4c5fc64fd2bbb99f856a30a4e (diff) |
Merge branch 'tip/perf/urgent-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/urgent
Diffstat (limited to 'include/linux/nmi.h')
0 files changed, 0 insertions, 0 deletions