diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-23 22:26:16 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-23 22:26:16 +0200 |
| commit | 86c65a7857896b1de99628ad392556965c4841e6 (patch) | |
| tree | 8cb153af048348261f7244600076a44354ec94c9 /drivers/char/tpm | |
| parent | Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmar... (diff) | |
| parent | Merge commit 'kumar/merge' into merge (diff) | |
| download | linux-86c65a7857896b1de99628ad392556965c4841e6.tar.xz linux-86c65a7857896b1de99628ad392556965c4841e6.zip | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
vmlinux.lds: fix .data..init_task output section (fix popwerpc boot)
powerpc: Fix erroneous lmb->memblock conversions
powerpc/mm: Add some debug output when hash insertion fails
powerpc/mm: Fix bugs in huge page hashing
powerpc/mm: Move around testing of _PAGE_PRESENT in hash code
powerpc/mm: Handle hypervisor pte insert failure in __hash_page_huge
powerpc/kexec: Fix boundary case for book-e kexec memory limits
Diffstat (limited to 'drivers/char/tpm')
0 files changed, 0 insertions, 0 deletions