summaryrefslogtreecommitdiffstats
path: root/arch/s390/include/asm/timex.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-07-24 18:39:54 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2012-07-24 18:39:54 +0200
commit759e2a253aaefbb6da9253d517a5a8fe1801ce0f (patch)
treea94099df1b69fda8899030adf12ab88931aad822 /arch/s390/include/asm/timex.h
parentMerge tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming (diff)
parentbf60x: fix build warning (diff)
downloadlinux-759e2a253aaefbb6da9253d517a5a8fe1801ce0f.tar.xz
linux-759e2a253aaefbb6da9253d517a5a8fe1801ce0f.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lliubbo/blackfin
Pull blackfin changes from Bob Liu: "The big changes are adding PM and HDMI support for bf60x, other patches are various bug fix and code cleanup." * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lliubbo/blackfin: (48 commits) bf60x: fix build warning PM: add BF60x flash suspend and resume support blackfin: twi: read twi mmr via bfin_read macro dpm: deepsleep: reserve stack bf60x: cpufreq: fix anomaly 05000273 bf609: add adv7511 display support blackfin: cplb-nompu: fix ROM cplb size for bf609-ezkit bf60x: Add double fault, hardware error and NMI SEC handler bf60x: update anomaly id in serial and twi driver headers. bf60x: vs6624 pin update bf60x: add default anomaly setting. bf60x: update bf60x anomaly list. bf60x: sec: Enable sec interrupt source priority configuration. bf60x: sec: Clean up interrupt initialization code for SEC. bf609: reuse bf5xx-i2s-pcm.c as i2s pcm driver bf561: add capabilities in adv7183_inputs bf609: convert vs6624 blank_clocks to black_pixels blackfin: fix musb macro name cleanup: sec and linkport only built on bf60x bfin: pint: add pint suspend and resume ...
Diffstat (limited to 'arch/s390/include/asm/timex.h')
0 files changed, 0 insertions, 0 deletions