diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-22 11:26:56 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-22 11:26:56 -0700 |
| commit | 8f6544edb2c7a7464fbbce1d86a4de414dc0cf95 (patch) | |
| tree | 5030e903106465b36e769ea04d4dfe2b91b22949 /drivers/power/tosa_battery.c | |
| parent | 4762e252f4afc6909edb0babe9c25f126afedcaa (diff) | |
| parent | fe4c51b22080691792d3e28d86acb4d4ccb7e8e8 (diff) | |
| download | op-kernel-dev-8f6544edb2c7a7464fbbce1d86a4de414dc0cf95.zip op-kernel-dev-8f6544edb2c7a7464fbbce1d86a4de414dc0cf95.tar.gz | |
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
perf tools: Add group event scheduling option to perf record/stat
MAINTAINERS: Fix list of perf events source files
perf tools: Fix build against newer glibc
perf tools: Fix error handling of unknown events
perf evlist: Fix missing event name init for default event
perf list: Fix exit value
Diffstat (limited to 'drivers/power/tosa_battery.c')
0 files changed, 0 insertions, 0 deletions
