From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 2 Aug 2012 18:52:39 +0000 (-0700)
Subject: Merge branch 'for-linus-3.6' of git://dev.laptop.org/users/dilinger/linux-olpc
X-Git-Tag: v5.15~21875
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=fc6bdb59a501740b28ed3b616641a22c8dc5dd31;p=mirror_ubuntu-kernels.git

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
---

fc6bdb59a501740b28ed3b616641a22c8dc5dd31