The following commit has been merged in the linux branch: commit b6727b12dd2ffb4a890eb5b13a298230c29ba45d Merge: eb2890c92fe3232345de5c8ba56e4ed4ae6422e1 b881c6cbb313dc3618075e81cd618e6ef7a3d159 Author: Linus Torvalds torvalds@linux-foundation.org Date: Sat Oct 31 12:16:20 2009 -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: fix wireless drivers depends Staging: wireless drivers Kconfig change Staging: android: mark subsystem as broken Staging: remove stlc45xx driver Staging: rtl8187se/rtl8192e/rtl8192su: allow module unload Staging: vt6656: fix the memory free bug in vntwusb_disconnect() Staging: Panel: prevent driver from calling misc_deregister twice on same ressource Staging: hv: fix oops in vmbus - missing #include Staging: hv: fix oops in vmbus - netvsc list_head Staging: hv: fix oops in vmbus - udev events Staging: hv: Fix vmbus load hang caused by faulty data packing Staging: hv: Fix null pointer error after vmbus loading Staging: hv TODO patches