tree 4f4a2fce8c81750f2f28e90149a6ee30fdeec1b6
parent c206d44ffdd539f5f4553e1a92cc7711084c1d3c
parent 54b9b308fa39e5147e2edde3492d8650b957be6c
author Linus Torvalds <torvalds@linux-foundation.org> 1281747892 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1281747892 -0700

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