Linus Torvalds 608adca523 Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile ...

Pull tile PCI build fixes from Chris Metcalf:
 "This fixes a couple of issues with the pci_bus.subordinate removal
  from pci-next as it affected the tile architecture.  One commit does
  the bombing for tilegx PCI (added during the merge window, so missed
  the pci-next bombing) and the other commit undoes a buggy part of the
  bombing for tilepro PCI."

* 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
  tilepro pci: fix pci_bus.subordinate bad bombing from b918c62e
  tilegx pci: fix semantic merge conflict with 3527ed81c

2012-07-26 13:48:08 -07:00

..

alpha

Merge branch 'pci/myron-pcibios_setup' into next

2012-07-05 15:31:05 -06:00

arm

Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

2012-07-26 13:00:59 -07:00

avr32

fixups for signal breakage

2012-06-04 17:47:34 -04:00

blackfin

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

2012-07-24 10:01:50 -07:00

c6x

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

2012-07-24 10:01:50 -07:00

cris

cris/PCI: factor out pcibios_setup()

2012-07-05 15:09:07 -06:00

frv

frv/PCI: move fixup hooks from __init to __devinit

2012-06-12 09:10:55 -06:00

h8300

h8300/uaccess: add mising __clear_user()

2012-07-11 16:04:46 -07:00

hexagon

hexagon: SMP: Remove call to ipi_call_lock()/ipi_call_unlock()

2012-06-05 17:27:11 +02:00

ia64

IOMMU Updates for Linux v3.6-rc1

2012-07-24 16:24:11 -07:00

m32r

Merge branch 'smp-hotplug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2012-07-22 11:22:15 -07:00

m68k

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu

2012-07-24 17:20:51 -07:00

microblaze

PCI changes for the 3.6 merge window:

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

mips

posix_types.h: Cleanup stale __NFDBITS and related definitions

2012-07-26 13:36:43 -07:00

mn10300

Merge branch 'smp-hotplug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2012-07-22 11:22:15 -07:00

openrisc

new helper: signal_delivered()

2012-06-01 12:58:52 -04:00

parisc

PCI changes for the 3.6 merge window:

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

powerpc

Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

2012-07-26 13:00:59 -07:00

s390

Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

2012-07-26 13:00:59 -07:00

score

new helper: signal_delivered()

2012-06-01 12:58:52 -04:00

sh

Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma

2012-07-24 17:12:54 -07:00

sparc

PCI changes for the 3.6 merge window:

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

tile

tilepro pci: fix pci_bus.subordinate bad bombing from b918c62e

2012-07-25 18:22:46 -04:00

um

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2012-07-19 11:17:30 -07:00

unicore32

PCI changes for the 3.6 merge window:

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

x86

Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2012-07-26 13:17:17 -07:00

xtensa

PCI changes for the 3.6 merge window:

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

.gitignore

…

Kconfig

…