tree 7f7d3519190ef95d3e3bf82048548e1cd3a6404b
parent 7de8b9261d6abbb2bd71aab6a5ac0981696dcd2c
parent fb29900217bd89370974870d47cab07bad3e5ac4
author Linus Torvalds <torvalds@linux-foundation.org> 1248895729 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1248895729 -0700

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: 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()