diff options
| author | Len Brown <[email protected]> | 2011-08-03 15:30:42 +0000 |
|---|---|---|
| committer | Len Brown <[email protected]> | 2011-08-03 15:30:42 +0000 |
| commit | d0e323b47057f4492b8fa22345f38d80a469bf8d (patch) | |
| tree | feb760c7e2cdb1e43640417409428ab858910ea3 /lib/cpumask.c | |
| 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 | kernel-d0e323b47057f4492b8fa22345f38d80a469bf8d.tar.gz kernel-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 <[email protected]>
Diffstat (limited to 'lib/cpumask.c')
0 files changed, 0 insertions, 0 deletions