summaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2011-01-15 15:23:27 +0100
committerIngo Molnar <mingo@elte.hu>2011-01-15 15:23:27 +0100
commit7c46d8da09df22361d1d43465c4f1b06cecaf25f (patch)
tree44342b27ffea30e3f5ed54f7e7ebc0221f5e6f5f /drivers/acpi
parentacac03fa15a8684bb60489ed87b5aae5258c0838 (diff)
parent7f85803a26f304e698c673838aab06cc6d4d6e59 (diff)
Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/urgent
Diffstat (limited to 'drivers/acpi')
0 files changed, 0 insertions, 0 deletions