From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 9 Feb 2009 21:58:40 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7d1676629e9262f441540ecb0cde57e5cafc632f;p=linux-beck.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6:
  Staging: panel: fix lcd panel driver build failure
  Staging: android: fix up units in timed_gpio
  Staging: android: ram_console: Disable ECC when early init is enabled and validate buffer size
  Staging: at76_usb: Add support for OQO Model 01+
  Staging: at76_usb: fix bugs introduced by "Staging: at76_usb: cleanup dma on stack issues"
  Revert Staging: at76_usb: update drivers/staging/at76_usb w/ mac80211 port
---

7d1676629e9262f441540ecb0cde57e5cafc632f