summaryrefslogtreecommitdiff
path: root/scripts/trace/power.pl
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-04-06 03:41:22 +0400
committerIngo Molnar <mingo@elte.hu>2009-04-06 03:41:22 +0400
commit9efe21cb82b5dbe3b0b2ae4de4eccc64ecb94e95 (patch)
tree7ff8833745d2f268f897f6fa4a27263b4a572245 /scripts/trace/power.pl
parentde18836e447c2dc30120c0919b8db8ddc0401cc4 (diff)
parent0221c81b1b8eb0cbb6b30a0ced52ead32d2b4e4c (diff)
downloadlinux-9efe21cb82b5dbe3b0b2ae4de4eccc64ecb94e95.tar.xz
Merge branch 'linus' into irq/threaded
Conflicts: include/linux/irq.h kernel/irq/handle.c
Diffstat (limited to 'scripts/trace/power.pl')
0 files changed, 0 insertions, 0 deletions