diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-16 09:47:43 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-16 09:47:43 -0800 |
commit | eef70b217a7ab46e8e0cf75982ad75d8305d5591 (patch) | |
tree | 85d34903a74f2581ac0e67d8e16e5c02855f37cd /kernel/Makefile | |
parent | c095adbc211f9f4e990eac7d6cb440de35e4f05f (diff) | |
parent | 23e0e8afafd9ac065d81506524adf3339584044b (diff) |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
powerpc/cell/axon-msi: Fix MSI after kexec
powerpc: Fix bootmem reservation on uninitialized node
powerpc: Check for valid hugepage size in hugetlb_get_unmapped_area
Diffstat (limited to 'kernel/Makefile')
0 files changed, 0 insertions, 0 deletions