Merge branch 'drivers/macb-gem-cleanup' into at91/gpio