]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'gpio/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 19 May 2014 06:40:56 +0000 (16:40 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 19 May 2014 06:40:56 +0000 (16:40 +1000)
commit90e92628c6134cc9c1e1536b7df8597da1a9ef41
tree2e61fb432624735f1ddbd4ffdbe36a00d688248a
parentcd8ffb7c59d589e9a59a1db9642aef14d7adc899
parent1524cd4cd4906dcc0ef238dc1d8d0bf293a9e19a
Merge remote-tracking branch 'gpio/for-next'

Conflicts:
Documentation/driver-model/devres.txt
Documentation/driver-model/devres.txt
MAINTAINERS