Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 29 Jul 2009 19:28:49 +0000 (12:28 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 29 Jul 2009 19:28:49 +0000 (12:28 -0700)
commitb7ebbb77f183061eb34dd210372d016c04371c26
tree7f7d3519190ef95d3e3bf82048548e1cd3a6404b
parent7de8b9261d6abbb2bd71aab6a5ac0981696dcd2c
parentfb29900217bd89370974870d47cab07bad3e5ac4
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()