]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'pinctrl/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 30 Apr 2012 04:43:48 +0000 (14:43 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 30 Apr 2012 04:43:48 +0000 (14:43 +1000)
commit807e01ef9596598fa3e2bb03a87662985ad16e02
tree0cffdb5b714821b9e899da8d67c3d12a4aafde92
parentcbacb165916a0867830706b629b0e769cbf18067
parent413ba2e15ce52f5d4418777d83663a0d516ff035
Merge remote-tracking branch 'pinctrl/for-next'

Conflicts:
Documentation/driver-model/devres.txt
drivers/pinctrl/core.c
Documentation/driver-model/devres.txt