Greg Kroah-Hartman 2bcb132c69 Merge 3.6-rc6 into usb-next ...

This resolves the merge problems with:
	drivers/usb/dwc3/gadget.c
	drivers/usb/musb/tusb6010.c
that had been seen in linux-next.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

2012-09-16 20:42:46 -07:00

..

alpha

alpha: Fix fall-out from disintegrating asm/system.h

2012-08-19 08:41:19 -07:00

arm

Merge 3.6-rc6 into usb-next

2012-09-16 20:42:46 -07:00

avr32

ipc: use Kconfig options for __ARCH_WANT_[COMPAT_]IPC_PARSE_VERSION

2012-07-30 17:25:21 -07:00

blackfin

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

2012-09-12 07:12:53 +08:00

c6x

Enable atomic64 ops in C6X

2012-08-17 08:10:12 -07:00

cris

ipc: use Kconfig options for __ARCH_WANT_[COMPAT_]IPC_PARSE_VERSION

2012-07-30 17:25:21 -07:00

frv

Merge branch 'akpm' (Andrew's patch-bomb)

2012-07-30 17:25:34 -07:00

h8300

ipc: use Kconfig options for __ARCH_WANT_[COMPAT_]IPC_PARSE_VERSION

2012-07-30 17:25:21 -07:00

hexagon

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

2012-07-30 11:24:53 -07:00

ia64

[IA64] defconfig: Remove CONFIG_MISC_DEVICES

2012-08-20 13:04:29 -07:00

m32r

ipc: use Kconfig options for __ARCH_WANT_[COMPAT_]IPC_PARSE_VERSION

2012-07-30 17:25:21 -07:00

m68k

m68k: select CONFIG_GENERIC_ATOMIC64 for all m68k CPU types

2012-08-17 10:04:24 +10:00

microblaze

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

2012-08-03 10:52:41 -07:00

mips

MIPS: pci-ar724x: avoid data bus error due to a missing PCIe module

2012-08-23 15:44:47 +02:00

mn10300

Merge branch 'akpm' (Andrew's patch-bomb)

2012-07-30 17:25:34 -07:00

openrisc

…

parisc

[PARISC] fix personality flag check in copy_thread()

2012-08-03 11:25:12 +01:00

powerpc

powerpc: Don't use __put_user() in patch_instruction

2012-09-05 16:05:23 +10:00

s390

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

2012-09-14 17:43:45 -07:00

score

…

sh

Merge branches 'sh/urgent' and 'sh/gpiolib' into sh-latest

2012-08-09 13:21:13 +09:00

sparc

sparc64: Be less verbose during vmemmap population.

2012-08-15 00:37:29 -07:00

tile

memcg: rename config variables

2012-07-31 18:42:43 -07:00

um

uml: fix compile error in deliver_alarm()

2012-09-05 19:40:59 -07:00

unicore32

PCI changes for the 3.6 merge window:

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

x86

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

2012-09-14 17:43:45 -07:00

xtensa

xtensa: select generic atomic64_t support

2012-07-31 18:42:39 -07:00

.gitignore

…

Kconfig

ipc: use Kconfig options for __ARCH_WANT_[COMPAT_]IPC_PARSE_VERSION

2012-07-30 17:25:21 -07:00