diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-16 08:32:06 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-16 08:32:06 -0700 |
commit | 1694a0a08e85baade75752a6a902a2fa30d608e8 (patch) | |
tree | 6369d7c382b721a768c951fe1489784ccd2bfb31 /fs/fifo.c | |
parent | 84a1caf1453c3d44050bd22db958af4a7f99315c (diff) | |
parent | 4a5f7eff8b0b34354e5c63272835e5e2dfe1c933 (diff) | |
download | linux-1694a0a08e85baade75752a6a902a2fa30d608e8.tar.gz linux-1694a0a08e85baade75752a6a902a2fa30d608e8.tar.bz2 linux-1694a0a08e85baade75752a6a902a2fa30d608e8.zip |
Merge tag 'fixes-for-v3.5-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl
Pull late pinctrl fixes from Linus Walleij:
- Two fixes to the i.MX driver
* tag 'fixes-for-v3.5-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
pinctrl: pinctrl-imx6q: add missed mux function for USBOTG_ID
pinctrl: pinctrl-imx: only print debug message when DEBUG is defined
Diffstat (limited to 'fs/fifo.c')
0 files changed, 0 insertions, 0 deletions