Merge tag 'pinctrl-mergebase-20120418' into HEAD