Linus Torvalds 2459c6099b Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc ... Pull Sparc fixes from David Miller: 1) Setup the core/threads/sockets bitmaps correctly so that 'lscpus' and friends operate properly. Frtom Chris Hyser. 2) The bit that normally means "Cached Virtually" on sun4v systems, actually changes meaning in M7 and later chips. Fix from Khalid Aziz. 3) One some PCI-E systems we need to probe different OF properties to fill in the PCI slot information properly, from Eric Snowberg. 4) Kill an extraneous memset after kzalloc(), from Christophe Jaillet. * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc: sparc: Resolve conflict between sparc v9 and M7 on usage of bit 9 of TTE sparc64: pci slots information is not populated in sysfs sparc: kernel: GRPCI2: Remove a useless memset sparc64: Setup sysfs to mark LDOM sockets, cores and threads correctly		2015-06-01 20:44:51 -07:00
..
alpha	alpha: kernel: osf_sys: Set 'kts.tv_nsec' only when 'tv' has effect	2015-05-26 10:01:51 -07:00
arc
arm	Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm	2015-05-31 12:20:59 -07:00
arm64	ARM: SoC fixes for 4.1-rc3	2015-05-16 15:33:25 -07:00
avr32
blackfin
c6x
cris
frv
hexagon
ia64	PCI / ACPI: Do not set ACPI companions for host bridges with parents	2015-05-28 01:39:53 +02:00
m32r
m68k
metag
microblaze
mips	MIPS: strnlen_user.S: Fix a CPU_DADDI_WORKAROUNDS regression	2015-05-29 20:23:58 +02:00
mn10300
nios2
openrisc
parisc
powerpc	This pull request includes a fix for two oopses, one on PPC	2015-05-21 20:15:16 -07:00
s390	Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2015-05-22 14:26:36 -07:00
score
sh
sparc	sparc: Resolve conflict between sparc v9 and M7 on usage of bit 9 of TTE	2015-05-31 22:15:01 -07:00
tile
um
unicore32
x86	Merge branch 'turbostat' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux	2015-05-31 11:39:25 -07:00
xtensa	xtensa: Provide dummy dma_alloc_attrs() and dma_free_attrs()	2015-05-25 23:03:16 +00:00
.gitignore
Kconfig