Linus Torvalds fc6bdb59a5 Merge branch 'for-linus-3.6' of git://dev.laptop.org/users/dilinger/linux-olpc ... Pull OLPC platform updates from Andres Salomon: "These move the OLPC Embedded Controller driver out of arch/x86/platform and into drivers/platform/olpc. OLPC machines are now ARM-based (which means lots of x86 and ARM changes), but are typically pretty self-contained.. so it makes more sense to go through a separate OLPC tree after getting the appropriate review/ACKs." * 'for-linus-3.6' of git://dev.laptop.org/users/dilinger/linux-olpc: x86: OLPC: move s/r-related EC cmds to EC driver Platform: OLPC: move global variables into priv struct Platform: OLPC: move debugfs support from x86 EC driver x86: OLPC: switch over to using new EC driver on x86 Platform: OLPC: add a suspended flag to the EC driver Platform: OLPC: turn EC driver into a platform_driver Platform: OLPC: allow EC cmd to be overridden, and create a workqueue to call it drivers: OLPC: update various drivers to include olpc-ec.h Platform: OLPC: add a stub to drivers/platform/ for the OLPC EC driver		2012-08-02 11:52:39 -07:00
..
accessibility
acpi	Merge branch 'linux-next' of git://cavan.codon.org.uk/platform-drivers-x86	2012-07-30 11:54:53 -07:00
amba
ata	ARM: arm-soc Marvell Orion device-tree updates	2012-08-02 11:50:24 -07:00
atm
auxdisplay
base	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2012-08-01 10:26:23 -07:00
bcma
block	Merge branch 'for-3.6/drivers' of git://git.kernel.dk/linux-block	2012-08-01 09:06:47 -07:00
bluetooth
cdrom
char	This patch series contains a major revamp of how we collect entropy	2012-07-31 19:07:42 -07:00
clk	clk: validate pointer in __clk_disable()	2012-07-30 17:25:13 -07:00
clocksource
connector
cpufreq	ARM: arm-soc soc updates, take 2	2012-07-30 09:45:53 -07:00
cpuidle
crypto	This patch series contains a major revamp of how we collect entropy	2012-07-31 19:07:42 -07:00
dca
devfreq
dio
dma	SuperH fixes for 3.6-rc1 merge window	2012-08-02 11:45:42 -07:00
edac
eisa
extcon	MFD bits for the 3.6 merge window.	2012-07-30 12:41:17 -07:00
firewire	- Small fixes and optimizations.	2012-07-30 09:32:39 -07:00
firmware	This patch series contains a major revamp of how we collect entropy	2012-07-31 19:07:42 -07:00
gpio	MFD bits for the 3.6 merge window.	2012-07-30 12:41:17 -07:00
gpu	Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux	2012-07-30 10:06:23 -07:00
hid	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media	2012-07-31 18:47:44 -07:00
hsi
hv	This patch series contains a major revamp of how we collect entropy	2012-07-31 19:07:42 -07:00
hwmon	Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging	2012-07-30 10:10:26 -07:00
hwspinlock
i2c	This patch series contains a major revamp of how we collect entropy	2012-07-31 19:07:42 -07:00
ide
idle
ieee802154
iio
infiniband	Merge branches 'cma', 'ipoib', 'ocrdma' and 'qib' into for-next	2012-07-30 07:47:27 -07:00
input	This patch series contains a major revamp of how we collect entropy	2012-07-31 19:07:42 -07:00
iommu
isdn
leds
lguest
macintosh
md	Additional md update for 3.6	2012-08-02 11:34:40 -07:00
media	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media	2012-07-31 18:47:44 -07:00
memory
memstick
message	drivers/message/i2o/i2o_config.c: bound allocation	2012-07-30 17:25:17 -07:00
mfd	This patch series contains a major revamp of how we collect entropy	2012-07-31 19:07:42 -07:00
misc	Merge branch 'akpm' (Andrew's patch-bomb)	2012-07-30 17:25:34 -07:00
mmc	Merge branch 'dmaengine' of git://git.linaro.org/people/rmk/linux-arm	2012-08-01 16:41:07 -07:00
mtd	Merge branch 'dmaengine' of git://git.linaro.org/people/rmk/linux-arm	2012-08-01 16:41:07 -07:00
net	Merge branch 'for-linus-3.6' of git://dev.laptop.org/users/dilinger/linux-olpc	2012-08-02 11:52:39 -07:00
nfc
nubus
of
oprofile
parisc
parport
pci
pcmcia
pinctrl
platform	Platform: OLPC: move global variables into priv struct	2012-07-31 23:27:31 -04:00
pnp
power	Merge branch 'for-linus-3.6' of git://dev.laptop.org/users/dilinger/linux-olpc	2012-08-02 11:52:39 -07:00
pps	pps: return PTR_ERR on error in device_create	2012-07-30 17:25:21 -07:00
ps3
ptp
pwm
rapidio
regulator	regulator: Fix an s5m8767 build failure	2012-07-31 00:51:09 +02:00
remoteproc
rpmsg
rtc	Merge branch 'akpm' (Andrew's patch-bomb)	2012-07-31 19:25:39 -07:00
s390
sbus
scsi	Merge branch 'for-3.6/core' of git://git.kernel.dk/linux-block	2012-08-01 09:02:41 -07:00
sfi
sh	Merge branch 'common/irqdomain' into sh-latest	2012-08-01 17:14:52 +09:00
sn
spi	Merge branch 'dmaengine' of git://git.linaro.org/people/rmk/linux-arm	2012-08-01 16:41:07 -07:00
ssb
staging	Merge branch 'for-linus-3.6' of git://dev.laptop.org/users/dilinger/linux-olpc	2012-08-02 11:52:39 -07:00
target	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2012-08-01 10:26:23 -07:00
tc
thermal	The tag contains just a few battery-related changes for v3.6. It's is	2012-07-31 18:08:25 -07:00
tty	serial: sh-sci: fix compilation breakage, when DMA is enabled	2012-08-01 13:48:54 +09:00
uio
usb	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2012-08-01 10:26:23 -07:00
uwb
vfio	vfio: Add PCI device driver	2012-07-31 08:16:24 -06:00
vhost
video	fbdev updates for 3.6	2012-08-01 10:45:12 -07:00
virt
virtio
vlynq
vme
w1
watchdog	ARM: arm-soc Marvell Orion device-tree updates	2012-08-02 11:50:24 -07:00
xen
zorro
Kconfig	vfio: VFIO core	2012-07-31 08:16:22 -06:00
Makefile	vfio: VFIO core	2012-07-31 08:16:22 -06:00