Olof Johansson 8b1a13b028 Merge branch 'next/drivers' into HEAD ... Conflicts: arch/arm/boot/dts/omap4.dtsi arch/arm/mach-clps711x/common.c arch/arm/mach-omap1/board-h2.c arch/arm/mach-omap1/board-h3.c arch/arm/mach-omap1/leds-h2p2-debug.c arch/arm/mach-omap1/leds.c arch/arm/mach-pnx4008/time.c arch/arm/plat-omap/debug-leds.c drivers/Makefile drivers/bus/omap_l3_noc.c		2012-10-01 14:33:55 -07:00
..
accessibility
acpi	PCI changes for the 3.7 merge window:	2012-10-01 12:05:36 -07:00
amba
ata
atm
auxdisplay
base	Driver core merge for 3.7-rc1	2012-10-01 12:10:44 -07:00
bcma
block	USB merge for 3.7-rc1	2012-10-01 13:23:01 -07:00
bluetooth	Merge branch 'for-arm-soc-next' of git://git.linaro.org/people/ljones/linux-3.0-ux500 into next/dt	2012-09-22 22:20:37 -07:00
bus	Merge branch 'next/drivers' into HEAD	2012-10-01 14:33:55 -07:00
cdrom
char	Merge branch 'next/drivers' into HEAD	2012-10-01 14:33:55 -07:00
clk	Merge branch 'next/soc2' into HEAD	2012-10-01 14:26:04 -07:00
clocksource	Merge branch 'next/soc' into HEAD	2012-10-01 14:19:17 -07:00
connector
cpufreq
cpuidle
crypto
dca
devfreq
dio
dma	Merge branch 'next/cleanup' into HEAD	2012-10-01 14:15:02 -07:00
edac	sb_edac: Avoid overflow errors at memory size calculation	2012-09-25 07:38:20 -03:00
eisa
extcon	Driver core merge for 3.7-rc1	2012-10-01 12:10:44 -07:00
firewire
firmware
gpio	Merge branch 'next/drivers' into HEAD	2012-10-01 14:33:55 -07:00
gpu	PCI changes for the 3.7 merge window:	2012-10-01 12:05:36 -07:00
hid	Staging tree update for 3.7-rc1	2012-10-01 12:11:39 -07:00
hsi
hv
hwmon	hwmon: (fam15h_power) Tweak runavg_range on resume	2012-09-23 20:54:09 +02:00
hwspinlock
i2c	Merge branch 'next/drivers' into HEAD	2012-10-01 14:33:55 -07:00
ide
idle
ieee802154
iio	iio: adc: add new lp8788 adc driver	2012-09-22 10:29:19 +01:00
infiniband	PCI changes for the 3.7 merge window:	2012-10-01 12:05:36 -07:00
input	Merge branch 'next/cleanup' into HEAD	2012-10-01 14:15:02 -07:00
iommu	PCI changes for the 3.7 merge window:	2012-10-01 12:05:36 -07:00
irqchip	irqchip: fill in empty Kconfig	2012-09-24 10:07:40 -07:00
isdn	Merge branch 'for-arm-soc-next' of git://git.linaro.org/people/ljones/linux-3.0-ux500 into next/dt	2012-09-22 22:20:37 -07:00
leds
lguest
macintosh
md	A few fixes for problems discovered during the 3.6 cycle.	2012-09-28 10:00:01 -07:00
media	Merge branch 'next/cleanup' into HEAD	2012-10-01 14:15:02 -07:00
memory	memory: tegra{20,30}-mc: Fix reading incorrect register in mc_readl()	2012-09-26 14:04:09 -07:00
memstick
message
mfd	Merge branch 'next/cleanup' into HEAD	2012-10-01 14:15:02 -07:00
misc	TTY merge for 3.7-rc1	2012-10-01 12:26:52 -07:00
mmc	Merge branch 'next/cleanup' into HEAD	2012-10-01 14:15:02 -07:00
mtd	Merge branch 'next/drivers' into HEAD	2012-10-01 14:33:55 -07:00
net	Merge branch 'next/cleanup' into HEAD	2012-10-01 14:15:02 -07:00
nfc
nubus
of
oprofile
parisc
parport
pci	PCI changes for the 3.7 merge window:	2012-10-01 12:05:36 -07:00
pcmcia	Merge branch 'next/cleanup' into HEAD	2012-10-01 14:15:02 -07:00
pinctrl	Merge branch 'next/drivers' into HEAD	2012-10-01 14:33:55 -07:00
platform
pnp
power	Merge branch 'next/cleanup' into HEAD	2012-10-01 14:15:02 -07:00
pps
ps3
ptp
pwm
rapidio
regulator	Merge remote-tracking branches 'regulator/topic/core', 'regulator/topic/bypass', 'regulator/topic/tol', 'regulator/topic/drivers' and 'regulator/topic/tps6586x' into regulator-next	2012-09-28 14:45:07 +01:00
remoteproc
rpmsg
rtc	Merge branch 'next/dt' into HEAD	2012-10-01 14:23:11 -07:00
s390	TTY merge for 3.7-rc1	2012-10-01 12:26:52 -07:00
sbus
scsi	Merge branch 'next/cleanup' into HEAD	2012-10-01 14:15:02 -07:00
sfi
sh	sh: pfc: Fix up GPIO mux type reconfig case.	2012-09-25 11:51:05 +09:00
sn
spi	Merge branch 'next/cleanup' into HEAD	2012-10-01 14:15:02 -07:00
ssb
staging	Merge branch 'next/cleanup' into HEAD	2012-10-01 14:15:02 -07:00
target	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2012-10-01 09:06:36 -07:00
tc
thermal
tty	Merge branch 'next/dt' into HEAD	2012-10-01 14:23:11 -07:00
uio
usb	Merge branch 'next/cleanup2' into HEAD	2012-10-01 14:25:41 -07:00
uwb
vfio	vfio: Fix virqfd release race	2012-09-21 10:48:28 -06:00
vhost
video	Merge branch 'next/cleanup2' into HEAD	2012-10-01 14:25:41 -07:00
virt
virtio
vlynq
vme
w1	char/misc driver merge for 3.7-rc1	2012-10-01 12:09:59 -07:00
watchdog	Merge branch 'next/cleanup' into HEAD	2012-10-01 14:15:02 -07:00
xen	USB merge for 3.7-rc1	2012-10-01 13:23:01 -07:00
zorro
Kconfig	Merge branch 'next/drivers' into HEAD	2012-10-01 14:33:55 -07:00
Makefile	Merge branch 'next/drivers' into HEAD	2012-10-01 14:33:55 -07:00