diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-05 19:24:52 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-05 19:24:52 +0100 |
| commit | 21511abd0a248a3f225d3b611cfabb93124605a7 (patch) | |
| tree | eb490f94322f3c76169ea7e5ec09524f275f390e /drivers/power/power_supply_sysfs.c | |
| parent | Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6 (diff) | |
| parent | [IA64] make pfm_get_task work with virtual pids (diff) | |
| download | linux-21511abd0a248a3f225d3b611cfabb93124605a7.tar.xz linux-21511abd0a248a3f225d3b611cfabb93124605a7.zip | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] make pfm_get_task work with virtual pids
[IA64] honor notify_die() returning NOTIFY_STOP
[IA64] remove dead code: __cpu_{down,die} from !HOTPLUG_CPU
[IA64] Appoint kvm/ia64 Maintainers
[IA64] ia64_set_psr should use srlz.i
[IA64] Export three symbols for module use
[IA64] mca style cleanup
[IA64] sn_hwperf semaphore to mutex
[IA64] generalize attribute of fsyscall_gtod_data
[IA64] efi.c Add /* never reached */ annotation
[IA64] efi.c Spelling/punctuation fixes
[IA64] Make efi.c mostly fit in 80 columns
[IA64] aliasing-test: fix gcc warnings on non-ia64
[IA64] Slim-down __clear_bit_unlock
[IA64] Fix the order of atomic operations in restore_previous_kprobes on ia64
[IA64] constify function pointer tables
[IA64] fix userspace compile error in gcc_intrin.h
Diffstat (limited to 'drivers/power/power_supply_sysfs.c')
0 files changed, 0 insertions, 0 deletions