Revision - fc6bdb5 - Merge branch 'for-linus-3.6' of [...] - origin: https://github.com/torvalds/linux

visit type:

https://github.com/torvalds/linux

05 April 2024, 19:05:47 UTC

Revision fc6bdb59a501740b28ed3b616641a22c8dc5dd31 authored by Linus Torvalds on 02 August 2012, 18:52:39 UTC, committed by Linus Torvalds on 02 August 2012, 18:52:39 UTC

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

2 parent s 44d82e2 + 1fcfd08

Files
Changes

Permalinks

Tip revision: fc6bdb59a501740b28ed3b616641a22c8dc5dd31 authored by Linus Torvalds on 02 August 2012, 18:52:39 UTC
Merge branch 'for-linus-3.6' of git://dev.laptop.org/users/dilinger/linux-olpc

Tip revision: fc6bdb5

File	Mode	Size
Documentation
arch
block
crypto
drivers
firmware
fs
include
init
ipc
kernel
lib
mm
net
samples
scripts
security
sound
tools
usr
virt
.gitignore	-rw-r--r--	1014 bytes
.mailmap	-rw-r--r--	4.4 KB
COPYING	-rw-r--r--	18.3 KB
CREDITS	-rw-r--r--	92.7 KB
Kbuild	-rw-r--r--	2.5 KB
Kconfig	-rw-r--r--	252 bytes
MAINTAINERS	-rw-r--r--	210.4 KB
Makefile	-rw-r--r--	46.1 KB
README	-rw-r--r--	17.3 KB
REPORTING-BUGS	-rw-r--r--	3.3 KB

Showing with 0 additions and 0 deletions (0 / 0 diffs computed)

Computing file changes ...

https://github.com/torvalds/linux

Merge branch 'for-linus-3.6' of git://dev.laptop.org/users/dilinger/linux-olpc

README