summaryrefslogtreecommitdiff
path: root/drivers/nfc
diff options
context:
space:
mode:
authorPaul Walmsley <paul@pwsan.com>2012-09-24 03:15:44 +0400
committerPaul Walmsley <paul@pwsan.com>2012-09-24 03:15:44 +0400
commit291852e8791a596195edc3ced96481bfd105f35b (patch)
tree5ac0d7f65cc21943863301fc50e62a616b168e8d /drivers/nfc
parent2910f14584eddf2bc0db4baec3c6950ef357b52c (diff)
parentde6ca33a96a6bf61fcb91d3d399703e19ead9d1e (diff)
downloadlinux-291852e8791a596195edc3ced96481bfd105f35b.tar.xz
Merge tag 'cleanup-fixes-for-v3.7' into test_v3.6-rc6_ocb3.7_cff3.7_odaf3.7
These fixes are needed to fix non-omap build breakage for twl-core driver and to fix omap1_defconfig compile when led driver changes and omap sparse IRQ changes are merged together. Also fix warnings for omaps not using pinctrl framework yet.
Diffstat (limited to 'drivers/nfc')
0 files changed, 0 insertions, 0 deletions