From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 29 Jul 2009 19:28:49 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
X-Git-Tag: v3.12-rc1~13720
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b7ebbb77f183061eb34dd210372d016c04371c26;p=kernel%2Fkernel-generic.git

Merge git://git./linux/kernel/git/gregkh/staging-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6:
  staging: udlfb: Add vmalloc.h include
  staging: remove aten2011 driver
  Staging: android: lowmemorykiller.c: fix it for "oom: move oom_adj value from task_struct to mm_struct"
  Staging: serqt_usb2: fix memory leak in error case
  Staging: serqt_usb2: add missing calls to tty_kref_put()
---

b7ebbb77f183061eb34dd210372d016c04371c26