I've uploaded a test version of the merged package here:
https://code.launchpad.net/~rbalint/+git/flash-kernel-merge/+ref/ubuntu/devel
I've uploaded a test version of the merged package here:
https:/ /code.launchpad .net/~rbalint/ +git/flash- kernel- merge/+ ref/ubuntu/ devel