tree 2ff1b212f0f515cfb7afa1467d4315f436bc9b88
parent 5488ace40be22d3f23f58190ae48b2c8d4691f2b
parent dcbbcefb6a6d540b605421e85fbaa4cea3fef5a2
author Linus Torvalds <torvalds@linux-foundation.org> 1233281660 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1233281660 -0800

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: poch: fix verification of memory area
  Staging: usbip: usbip_start_threads(): handle kernel_thread failure
  staging: agnx: drivers/staging/agnx/agnx.h needs <linux/io.h>
  Staging: android: task_get_unused_fd_flags: fix the wrong usage of tsk->signal
  Staging: android: Add lowmemorykiller documentation.
  Staging: android: fix build error on 64bit boxes
  Staging: android: timed_gpio: Fix build to build on kernels after 2.6.25.
  Staging: android: binder: fix arm build errors
  Staging: meilhaus: fix Kbuild
  Staging: comedi: fix Kbuild