diff options
author | 2010-03-19 13:42:43 -0700 | |
---|---|---|
committer | 2010-03-19 13:42:43 -0700 | |
commit | 95c46afe6034d15bdf0f95d69f25489cecad9a47 (patch) | |
tree | a3bff5de25890f6de94cbf431bb0f94073893507 /lib/debugobjects.c | |
parent | Merge branch 'zerolen' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6 (diff) | |
parent | powerpc: Remove IOMMU_VMERGE config option (diff) | |
download | wireguard-linux-95c46afe6034d15bdf0f95d69f25489cecad9a47.tar.xz wireguard-linux-95c46afe6034d15bdf0f95d69f25489cecad9a47.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:
powerpc: Remove IOMMU_VMERGE config option
powerpc: Fix swiotlb to respect the boot option
powerpc: Do not call prink when CONFIG_PRINTK is not defined
powerpc: Use correct ccr bit for syscall error status
powerpc/fsl-booke: Get coherent bit from PTE
powerpc/85xx: Make sure lwarx hint isn't set on ppc32
Diffstat (limited to 'lib/debugobjects.c')
0 files changed, 0 insertions, 0 deletions