summaryrefslogtreecommitdiff
path: root/Kbuild
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2013-01-29 09:48:30 (GMT)
committerJiri Kosina <jkosina@suse.cz>2013-01-29 09:48:30 (GMT)
commit617677295b53a40d0e54aac4cbbc216ffbc755dd (patch)
tree51b9e87213243ed5efff252c8e8d8fec4eebc588 /Kbuild
parent5c8d1b68e01a144813e38795fe6dbe7ebb506131 (diff)
parent6abb7c25775b7fb2225ad0508236d63ca710e65f (diff)
downloadlinux-fsl-qoriq-617677295b53a40d0e54aac4cbbc216ffbc755dd.tar.xz
Merge branch 'master' into for-next
Conflicts: drivers/devfreq/exynos4_bus.c Sync with Linus' tree to be able to apply patches that are against newer code (mvneta).
Diffstat (limited to 'Kbuild')
0 files changed, 0 insertions, 0 deletions