summaryrefslogtreecommitdiffstats
path: root/lib/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-06-03 23:34:51 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2013-06-03 23:34:51 +0200
commit042dd60ca6dec9a02cefa8edd67de386e35755d6 (patch)
treeb01038f9f60e4ba271359468fdd5c881ed7ced3b /lib/Makefile
parentMerge tag 'jfs-3.10-rc5' of git://github.com/kleikamp/linux-shaggy (diff)
parentMerge remote-tracking branch 'regulator/fix/palmas' into regulator-linus (diff)
downloadlinux-042dd60ca6dec9a02cefa8edd67de386e35755d6.tar.xz
linux-042dd60ca6dec9a02cefa8edd67de386e35755d6.zip
Merge tag 'regulator-v3.10-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator
Pull regulator fixes from Mark Brown: "A few small fixes for v3.10, documentation things in the core and a few driver bugs." * tag 'regulator-v3.10-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: regulator: palmas: Fix "enable_reg" to point to the correct reg for SMPS10 regulator: palmas: Fix incorrect condition regulator: core: Correct spelling mistake in comment regulator: dbx500: Make local symbol static regulator: Fix kernel-doc generation warnings.
Diffstat (limited to 'lib/Makefile')
0 files changed, 0 insertions, 0 deletions