diff options
| author | Linus Torvalds | 2013-01-03 13:10:18 -0800 |
|---|---|---|
| committer | Linus Torvalds | 2013-01-03 13:10:18 -0800 |
| commit | 5f738967e89584f99c6a11c6bf09b16c50b6a03e (patch) | |
| tree | c807b116deb121277799f316052349a5fa663af0 /net/ipv4/ip_gre.c | |
| parent | 2318aa272072f6906de8e00a332da1485506b3c5 (diff) | |
| parent | 9fcb4cc2d7dd192ae718f0e7484c6f5c08b8af23 (diff) | |
Merge tag 'pinctrl-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl
Pull pinctrl fixes from Linus Walleij:
"A first round of pinctrl fixes for v3.8:
- i.MX5 register configuration
- Swap a kfree to devm_kfree() to avoid memory corruption in the at91
driver
- Add the missing device tree binding doc for the SIRF pin controller
- Enable the SIRF GPIO pull up/down configuration from the device
tree, it was previously retired from the hard-coded approach.
- NULL check for the prcm_base in the Nomadik pin controller.
- Provide the prcm_base from the device tree in the DT boot path for
the Nomadik pin controller."
* tag 'pinctrl-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
ARM: ux500: add pinctrl address resources
pinctrl: nomadik: return if prcm_base is NULL
pinctrl: sirf: enable GPIO pullup/down configuration from dts
pinctrl: sirf: add missing DT-binding document
pinctrl: fix comment mistake
drivers/pinctrl/pinctrl-at91.c: convert kfree to devm_kfree
pinctrl: imx5: fix GPIO_8 pad CAN1_RXCAN configuration
Diffstat (limited to 'net/ipv4/ip_gre.c')
0 files changed, 0 insertions, 0 deletions