summaryrefslogtreecommitdiff
path: root/drivers/bcma
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-05-04 00:21:05 (GMT)
committerLinus Torvalds <torvalds@linux-foundation.org>2012-05-04 00:21:05 (GMT)
commit0a6ba092d1c8c75ae0c0617ef7f4e6f5043af311 (patch)
tree9a9afdaf58ab356aa457b6f5c8a2e80c85762901 /drivers/bcma
parent65e62b502bdaee37b6ea57edc3bb0df2ad1cb858 (diff)
parent13176a89e1c4a0011bd9f576730b0338ecb619ff (diff)
downloadlinux-fsl-qoriq-0a6ba092d1c8c75ae0c0617ef7f4e6f5043af311.tar.xz
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/bcma')
0 files changed, 0 insertions, 0 deletions