diff options
author | 2006-11-13 08:20:38 -0800 | |
---|---|---|
committer | 2006-11-13 08:20:38 -0800 | |
commit | 239fd45938f9ddf64f120e0260c7b76eb73bd5a7 (patch) | |
tree | 2b0350fb9f45f2ffa7473e6c3d75f9ff26d85e82 /include/linux/init.h | |
parent | Merge git://oss.sgi.com:8090/xfs/xfs-2.6 (diff) | |
parent | [POWERPC] cell: set ARCH_SPARSEMEM_DEFAULT in Kconfig (diff) | |
download | wireguard-linux-239fd45938f9ddf64f120e0260c7b76eb73bd5a7.tar.xz wireguard-linux-239fd45938f9ddf64f120e0260c7b76eb73bd5a7.zip |
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: set ARCH_SPARSEMEM_DEFAULT in Kconfig
[POWERPC] Fix cell "new style" mapping and add debug
[POWERPC] pseries: Force 4k update_flash block and list sizes
[POWERPC] CPM_UART: Fix non-console initialisation
[POWERPC] CPM_UART: Fix non-console transmit
[POWERPC] Make sure initrd and dtb sections get into zImage correctly
Diffstat (limited to 'include/linux/init.h')
0 files changed, 0 insertions, 0 deletions