aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/power/main.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-04-27 17:01:37 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-04-27 17:01:37 -0700
commit37e53db8aa233c65142d63b496277bf5be9c0ade (patch)
treec4b7409825cc0497593e94dd7d6f874d22b0b3f0 /kernel/power/main.c
parentMerge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6 (diff)
parent[IA64] update sn2 defconfig (diff)
downloadlinux-dev-37e53db8aa233c65142d63b496277bf5be9c0ade.tar.xz
linux-dev-37e53db8aa233c65142d63b496277bf5be9c0ade.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] update sn2 defconfig [IA64] Add mca recovery failure messages [IA64-SGI] fix SGI Altix tioce_reserve_m32() bug [IA64] enable dumps to capture second page of kernel stack [IA64-SGI] - Reduce overhead of reading sn_topology [IA64-SGI] - Fix discover of nearest cpu node to IO node [IA64] IOC4 config option ordering [IA64] Setup an IA64 specific reclaim distance [IA64] eliminate compile time warnings [IA64] eliminate compile time warnings [IA64-SGI] SN SAL call to inject memory errors [IA64] - Fix MAX_PXM_DOMAINS for systems with > 256 nodes [IA64] Remove unused variable in sn_sal.h [IA64] Remove redundant NULL checks before kfree [IA64] wire up compat_sys_adjtimex()
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions