Merge git://git.kernel.org/pub/scm/linux/kernel/git/lwfinger/linux-staging into stagi...
commit60b0fa1af9b323f096fb5335f33cc5b4a8f0198d
authorGreg Kroah-Hartman <gregkh@suse.de>
Mon, 25 Apr 2011 23:55:53 +0000 (25 16:55 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Mon, 25 Apr 2011 23:55:53 +0000 (25 16:55 -0700)
tree10a943a73593a1be7be0b0833a1daf7a7bfcd9bf
parent5d46f3266728913d05106ee82fb5f043be06eb21
parent0215c5cfd79e8c2e88c713cc8485d095e810c662
Merge git://git./linux/kernel/git/lwfinger/linux-staging into staging-next

* 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>
drivers/staging/Kconfig
drivers/staging/Makefile