Merge branches 'drivers/macb-gem' and 'drivers/pxa-gpio' into next/drivers