linux-mainline 3.8: bebopr cape fixes

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>