• Linus Torvalds's avatar
    Merge branch 'x86-olpc-for-linus' of... · fa8f53ac
    Linus Torvalds authored
    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
    fa8f53ac
Kconfig 67.7 KB