Linus Torvalds 1347a2cebc Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild ...

Pull kbuild updates from Michal Marek.

Fixed up nontrivial merge conflict in Makefile as per Stephen Rothwell
and linux-next (and trivial arch/sparc/Makefile changes due to removed
sparc32 logic).

* 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
  mips: Fix KBUILD_CPPFLAGS definition
  kbuild: fix ia64 link
  kbuild: document KBUILD_LDS, KBUILD_VMLINUX_{INIT,MAIN} and LDFLAGS_vmlinux
  kbuild: link of vmlinux moved to a script
  kbuild: refactor final link of sparc32
  kbuild: drop unused KBUILD_VMLINUX_OBJS from top-level Makefile
  kbuild: Makefile: remove unnecessary check for m68knommu ARCH

2012-05-28 10:32:28 -07:00

..

alchemy

MIPS: Alchemy: Increase minimum timeout for 32kHz timer.

2012-02-20 18:33:18 +01:00

ar7

Merge branches 'next/ar7', 'next/ath79', 'next/bcm63xx', 'next/bmips', 'next/cavium', 'next/generic', 'next/kprobes', 'next/lantiq', 'next/perf' and 'next/raza' into mips-for-linux-next

2012-01-11 15:42:31 +01:00

ath79

MIPS: ath79: fix AR933X WMAC reset code

2012-04-27 15:18:30 +01:00

bcm47xx

bcma: Move initialization of SPROM to prevent overwrite

2012-05-16 12:46:03 -04:00

bcm63xx

mips: Fix typo in bcm63xx/setup.c

2012-02-05 17:14:47 +01:00

boot

…

cavium-octeon

Merge branch 'for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping

2012-04-04 17:13:43 -07:00

cobalt

…

configs

tokenring: delete all remaining driver support

2012-05-15 20:23:16 -04:00

dec

Disintegrate asm/system.h for MIPS

2012-03-28 18:30:02 +01:00

emma

Disintegrate asm/system.h for MIPS

2012-03-28 18:30:02 +01:00

fw

Disintegrate and delete asm/system.h

2012-03-28 15:58:21 -07:00

include/asm

Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm

2012-05-24 16:17:30 -07:00

jazz

Merge branch 'next/generic' into mips-for-linux-next

2012-01-11 15:41:47 +01:00

jz4740

ASoC: jz4740: Convert qi_lb60 to use snd_soc_register_card()

2012-01-20 13:58:29 +00:00

kernel

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal

2012-05-23 18:11:45 -07:00

lantiq

mips: Fix printk typos in arc/mips

2012-04-05 17:04:27 -07:00

lasat

Disintegrate asm/system.h for MIPS

2012-03-28 18:30:02 +01:00

lib

mips: use the the PCI controller's io_map_base

2012-01-31 23:20:30 +02:00

loongson

…

math-emu

Disintegrate asm/system.h for MIPS

2012-03-28 18:30:02 +01:00

mipssim

Disintegrate asm/system.h for MIPS

2012-03-28 18:30:02 +01:00

mm

Merge branch 'for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping

2012-04-04 17:13:43 -07:00

mti-malta

Disintegrate asm/system.h for MIPS

2012-03-28 18:30:02 +01:00

netlogic

remove references to cpu_*_map in arch/

2012-03-29 15:38:30 +10:30

oprofile

…

pci

edac, mips: don't change code that has been removed in edac/mips tree

2012-05-22 11:00:09 +02:00

pmc-sierra

documentation: remove references to cpu_*_map.

2012-03-29 15:38:31 +10:30

pnx833x

Disintegrate asm/system.h for MIPS

2012-03-28 18:30:02 +01:00

pnx8550

…

power

…

powertv

Disintegrate asm/system.h for MIPS

2012-03-28 18:30:02 +01:00

rb532

Disintegrate asm/system.h for MIPS

2012-03-28 18:30:02 +01:00

sgi-ip22

Disintegrate asm/system.h for MIPS

2012-03-28 18:30:02 +01:00

sgi-ip27

remove references to cpu_*_map in arch/

2012-03-29 15:38:30 +10:30

sgi-ip32

Disintegrate asm/system.h for MIPS

2012-03-28 18:30:02 +01:00

sibyte

documentation: remove references to cpu_*_map.

2012-03-29 15:38:31 +10:30

sni

Merge branch 'master' into for-next

2012-04-08 21:48:52 +02:00

txx9

MIPS: txx9 7segled fix struct device has no member

2012-02-20 18:33:18 +01:00

vr41xx

Disintegrate asm/system.h for MIPS

2012-03-28 18:30:02 +01:00

wrppmc

…

Kbuild

…

Kbuild.platforms

…

Kconfig

GPIO driver changes for v3.5 merge window

2012-05-24 14:01:46 -07:00

Kconfig.debug

Fix typo in various Kconfig file

2012-04-16 14:40:08 +02:00

Makefile

Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

2012-05-28 10:32:28 -07:00