Merge git://git.kernel.org/pub/scm/linux/kernel/git/lwfinger/linux-staging into stagi...
authorGreg Kroah-Hartman <gregkh@suse.de>
Mon, 25 Apr 2011 23:55:53 +0000 (16:55 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Mon, 25 Apr 2011 23:55:53 +0000 (16:55 -0700)
* git://git.kernel.org/pub/scm/linux/kernel/git/lwfinger/linux-staging:
  staging: rt2860sta and rt2870sta: Remove drivers replaced in net/wireless

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Trivial merge