diff options
author | Jens Axboe <axboe@kernel.dk> | 2011-10-19 16:30:42 +0400 |
---|---|---|
committer | Jens Axboe <axboe@kernel.dk> | 2011-10-19 16:30:42 +0400 |
commit | 5c04b426f2e8b46cfc7969a35b2631063a3c646c (patch) | |
tree | 2d27d9f5d2fe5d5e8fbc01a467ec58bcb50235c1 /tools/power/cpupower/debug/x86_64/centrino-decode.c | |
parent | 499337bb6511e665a236a6a947f819d98ea340c6 (diff) | |
parent | 899e3ee404961a90b828ad527573aaaac39f0ab1 (diff) | |
download | linux-5c04b426f2e8b46cfc7969a35b2631063a3c646c.tar.xz |
Merge branch 'v3.1-rc10' into for-3.2/core
Conflicts:
block/blk-core.c
include/linux/blkdev.h
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'tools/power/cpupower/debug/x86_64/centrino-decode.c')
l--------- | tools/power/cpupower/debug/x86_64/centrino-decode.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tools/power/cpupower/debug/x86_64/centrino-decode.c b/tools/power/cpupower/debug/x86_64/centrino-decode.c deleted file mode 120000 index 26fb3f1d8fc7..000000000000 --- a/tools/power/cpupower/debug/x86_64/centrino-decode.c +++ /dev/null @@ -1 +0,0 @@ -../i386/centrino-decode.c
\ No newline at end of file |