summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds2010-07-23 22:26:16 +0200
committerLinus Torvalds2010-07-23 22:26:16 +0200
commit86c65a7857896b1de99628ad392556965c4841e6 (patch)
tree8cb153af048348261f7244600076a44354ec94c9 /drivers
parentMerge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmar... (diff)
parentMerge commit 'kumar/merge' into merge (diff)
downloadkernel-qcow2-linux-86c65a7857896b1de99628ad392556965c4841e6.tar.gz
kernel-qcow2-linux-86c65a7857896b1de99628ad392556965c4841e6.tar.xz
kernel-qcow2-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')
0 files changed, 0 insertions, 0 deletions