diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-04 02:21:05 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-04 02:21:05 +0200 |
commit | 0a6ba092d1c8c75ae0c0617ef7f4e6f5043af311 (patch) | |
tree | 9a9afdaf58ab356aa457b6f5c8a2e80c85762901 /drivers/firmware/google | |
parent | Merge branch 'efi-vars' from Matthew Garrett (diff) | |
parent | mfd: Fix build breakage in omap-usb-host.c (diff) | |
download | linux-0a6ba092d1c8c75ae0c0617ef7f4e6f5043af311.tar.xz linux-0a6ba092d1c8c75ae0c0617ef7f4e6f5043af311.zip |
Merge tag 'mfd-for-linus-3.4-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6
Pull second set of MFD fixes from Samuel Ortiz:
"This time we only have a one liner fixing an omap-usb build error."
* tag 'mfd-for-linus-3.4-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6:
mfd: Fix build breakage in omap-usb-host.c
Diffstat (limited to 'drivers/firmware/google')
0 files changed, 0 insertions, 0 deletions