tree 4e07c0d5a2aeca013c38c4845229c726a14b4050
parent 642ba5ed7ac7a2369ed2a3c5aa4d76306d06bd03
parent 45f034ef205e5439a50d6f7e5f89add93131c0cc
author Linus Torvalds <torvalds@linux-foundation.org> 1321375731 -0200
committer Linus Torvalds <torvalds@linux-foundation.org> 1321375731 -0200

Merge branch 'fixes' of git://git.linaro.org/people/triad/linux-pinctrl

* 'fixes' of git://git.linaro.org/people/triad/linux-pinctrl:
  pinctrl: hide subsystem from the populace
  pinctrl: fix "warning: 'struct pinctrl_dev' declared inside parameter list"