blu_active: merge Linux 3.5 upstream and CAF updates