diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-26 11:11:54 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-26 11:11:54 -0700 |
| commit | fa8f53ace4af9470d8414427cb3dc3c0ffc4f182 (patch) | |
| tree | 23fadefaa50c5ee1a68730757dab3bbaf994243f /fs | |
| parent | 1d87c28e680ce4ecb8c260d8ce070b8339d52abb (diff) | |
| parent | 07d5b38e14b7ff98eb52e4a6db4e20abcc608da3 (diff) | |
Merge branch 'x86-olpc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-olpc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, olpc-xo15-sci: Enable EC wakeup capability
x86, olpc: Fix dependency on POWER_SUPPLY
x86, olpc: Add XO-1.5 SCI driver
x86, olpc: Add XO-1 RTC driver
x86, olpc-xo1-sci: Propagate power supply/battery events
x86, olpc-xo1-sci: Add lid switch functionality
x86, olpc-xo1-sci: Add GPE handler and ebook switch functionality
x86, olpc: EC SCI wakeup mask functionality
x86, olpc: Add XO-1 SCI driver and power button control
x86, olpc: Add XO-1 suspend/resume support
x86, olpc: Rename olpc-xo1 to olpc-xo1-pm
x86, olpc: Move CS5536-related constants to cs5535.h
x86, olpc: Add missing elements to device tree
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions