tree 080232e75f0e138b8642af44b18d296011afdebb
parent 3c4f1158cd887a1a8c1309fc6d07907160e8e820
parent acfa5110b83b171ec509eaf2d1a9e93a5f4709bd
author Linus Torvalds <torvalds@linux-foundation.org> 1235782186 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1235782186 -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: w35und: fix usb_control_msg() error handling in wb35_probe()
  Staging: w35und: fix registration with wlan stack
  Staging: panel: fix oops on panel_cleanup_module
  Staging: rtl8187se: Fix oops and memory poison caused by builtin ieee80211.
  Staging: rtl8187se: fix Kconfig dependencies