Merge commit 'jwb/jwb-merge' into merge
Manual merge of: arch/powerpc/configs/44x/warp_defconfig
Showing
- arch/powerpc/boot/cuboot-warp.c 0 additions, 43 deletionsarch/powerpc/boot/cuboot-warp.c
- arch/powerpc/boot/dts/haleakala.dts 4 additions, 1 deletionarch/powerpc/boot/dts/haleakala.dts
- arch/powerpc/boot/dts/kilauea.dts 4 additions, 1 deletionarch/powerpc/boot/dts/kilauea.dts
- arch/powerpc/boot/dts/makalu.dts 4 additions, 1 deletionarch/powerpc/boot/dts/makalu.dts
- arch/powerpc/boot/dts/warp.dts 41 additions, 1 deletionarch/powerpc/boot/dts/warp.dts
- arch/powerpc/configs/40x/acadia_defconfig 56 additions, 20 deletionsarch/powerpc/configs/40x/acadia_defconfig
- arch/powerpc/configs/40x/ep405_defconfig 65 additions, 22 deletionsarch/powerpc/configs/40x/ep405_defconfig
- arch/powerpc/configs/40x/hcu4_defconfig 58 additions, 20 deletionsarch/powerpc/configs/40x/hcu4_defconfig
- arch/powerpc/configs/40x/kilauea_defconfig 56 additions, 20 deletionsarch/powerpc/configs/40x/kilauea_defconfig
- arch/powerpc/configs/40x/makalu_defconfig 56 additions, 20 deletionsarch/powerpc/configs/40x/makalu_defconfig
- arch/powerpc/configs/40x/virtex_defconfig 37 additions, 16 deletionsarch/powerpc/configs/40x/virtex_defconfig
- arch/powerpc/configs/40x/walnut_defconfig 63 additions, 21 deletionsarch/powerpc/configs/40x/walnut_defconfig
- arch/powerpc/configs/44x/arches_defconfig 42 additions, 18 deletionsarch/powerpc/configs/44x/arches_defconfig
- arch/powerpc/configs/44x/bamboo_defconfig 55 additions, 21 deletionsarch/powerpc/configs/44x/bamboo_defconfig
- arch/powerpc/configs/44x/canyonlands_defconfig 42 additions, 18 deletionsarch/powerpc/configs/44x/canyonlands_defconfig
- arch/powerpc/configs/44x/ebony_defconfig 63 additions, 21 deletionsarch/powerpc/configs/44x/ebony_defconfig
- arch/powerpc/configs/44x/katmai_defconfig 55 additions, 21 deletionsarch/powerpc/configs/44x/katmai_defconfig
- arch/powerpc/configs/44x/rainier_defconfig 62 additions, 21 deletionsarch/powerpc/configs/44x/rainier_defconfig
- arch/powerpc/configs/44x/sam440ep_defconfig 55 additions, 22 deletionsarch/powerpc/configs/44x/sam440ep_defconfig
- arch/powerpc/configs/44x/sequoia_defconfig 62 additions, 21 deletionsarch/powerpc/configs/44x/sequoia_defconfig
Loading
Please register or sign in to comment