summaryrefslogtreecommitdiffstats
path: root/kernel/Kconfig.locks
diff options
context:
space:
mode:
authorLinus Torvalds2012-05-04 02:21:05 +0200
committerLinus Torvalds2012-05-04 02:21:05 +0200
commit0a6ba092d1c8c75ae0c0617ef7f4e6f5043af311 (patch)
tree9a9afdaf58ab356aa457b6f5c8a2e80c85762901 /kernel/Kconfig.locks
parentMerge branch 'efi-vars' from Matthew Garrett (diff)
parentmfd: Fix build breakage in omap-usb-host.c (diff)
downloadkernel-qcow2-linux-0a6ba092d1c8c75ae0c0617ef7f4e6f5043af311.tar.gz
kernel-qcow2-linux-0a6ba092d1c8c75ae0c0617ef7f4e6f5043af311.tar.xz
kernel-qcow2-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 'kernel/Kconfig.locks')
0 files changed, 0 insertions, 0 deletions