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
..
acpi
asm-generic
crypto
drm
keys
linux	Merge branch 'for-linus-3.6' of git://dev.laptop.org/users/dilinger/linux-olpc	2012-08-02 11:52:39 -07:00
math-emu
media
memory
misc
mtd
net	Merge branch 'akpm' (Andrew's patch-bomb)	2012-07-31 19:25:39 -07:00
pcmcia
ras
rdma
rxrpc
scsi
sound	Sound fixes for 3.6-rc1	2012-08-01 10:42:26 -07:00
target
trace	Merge branch 'akpm' (Andrew's patch-bomb)	2012-07-31 19:25:39 -07:00
video
xen
Kbuild