diff options
| author | Len Brown <len.brown@intel.com> | 2011-08-03 17:30:42 +0200 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2011-08-03 17:30:42 +0200 |
| commit | d0e323b47057f4492b8fa22345f38d80a469bf8d (patch) | |
| tree | feb760c7e2cdb1e43640417409428ab858910ea3 /Documentation/ABI/obsolete/proc-pid-oom_adj | |
| parent | oom: task->mm == NULL doesn't mean the memory was freed (diff) | |
| parent | ACPI, APEI, EINJ Param support is disabled by default (diff) | |
| download | linux-d0e323b47057f4492b8fa22345f38d80a469bf8d.tar.xz linux-d0e323b47057f4492b8fa22345f38d80a469bf8d.zip | |
Merge branch 'apei' into apei-release
Some trivial conflicts due to other various merges
adding to the end of common lists sooner than this one.
arch/ia64/Kconfig
arch/powerpc/Kconfig
arch/x86/Kconfig
lib/Kconfig
lib/Makefile
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'Documentation/ABI/obsolete/proc-pid-oom_adj')
0 files changed, 0 insertions, 0 deletions