Merge branch 'prima2/drivers' of git://gitorious.org/sirfprima2-kernel/sirfprima2...