From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 14 Aug 2010 01:04:52 +0000 (-0700)
Subject: Merge git://git.infradead.org/~dwmw2/ideapad-2.6
X-Git-Tag: v2.6.36-rc1~24
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=75a1e32cce30ab1c5a361ebae24a18753e42feaa;p=linux.git

Merge git://git.infradead.org/~dwmw2/ideapad-2.6

* git://git.infradead.org/~dwmw2/ideapad-2.6:
  Call acpi_video_register() in intel_opregion_init() failure path
  ideapad: Only allow camera state to be set to 0 or 1
  ideapad: Stop using global variables
  Add Lenovo ideapad driver
---

75a1e32cce30ab1c5a361ebae24a18753e42feaa