diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-12-09 17:30:21 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-12-09 17:30:21 (GMT) |
commit | 32ac486967a1786ffbdf958cfb2c33f42c5a6103 (patch) | |
tree | 8829b70afb04648b4d1df05fbcca80648c46bf0e /include/net/llc_c_ac.h | |
parent | 77bd2adb97271c5f2237cfacf5984cc810033131 (diff) | |
parent | 88ec6a4d836904a75bef87bfcd906193ad11d88a (diff) | |
download | linux-fsl-qoriq-32ac486967a1786ffbdf958cfb2c33f42c5a6103.tar.xz |
Merge tag 'mfd-fixes-3.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-fixes
Pull mfd fixes from Samuel Ortiz:
"This is the first 3.13 pull request for MFD fixes. We have:
- A ti-ssp build failure fix
- An as3722 build failure fix
- An lpc_ich copy paste error fix"
* tag 'mfd-fixes-3.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-fixes:
mfd: lpc_ich: Fix Wildcat Point info name field
mfd: ti-ssp: Fix build
mfd: Make MFD_AS3722 depend on I2C=y
Diffstat (limited to 'include/net/llc_c_ac.h')
0 files changed, 0 insertions, 0 deletions