Learn more about cloning repositories
You have read-only access
Merge branch 'gpio-for-grant' of git://sources.calxeda.com/kernel/linux into gpio/next Conflicts: drivers/gpio/gpio-pl061.c
