aboutsummaryrefslogtreecommitdiff
path: root/kernel/itimer.c
diff options
context:
space:
mode:
authorPaul Walmsley <paul@pwsan.com>2012-04-05 03:00:22 -0600
committerPaul Walmsley <paul@pwsan.com>2012-04-05 03:00:22 -0600
commita9dd31b744a033b4324c93cec4ecb4c74061e2cf (patch)
tree779ad05a3bb28ca575034c3c1b230f2d8c0c9bda /kernel/itimer.c
parent5897a391d41d42f19285376a4ad1320d452c2946 (diff)
parent7a82ebd9ee78f8ba3a2ba66e003bfa57954a1a04 (diff)
parent26c547fd130aae7480523a3af3f1df2ef1144743 (diff)
parent503d0ea24d1d3dd3db95e5e0edd693da7a2a23eb (diff)
parent4ce107ccd714e54f7076aba585295421d30ad7f7 (diff)
parent8b8c3c7895dc8dcf60c58b23bc9231f4ee7887a2 (diff)
Merge branches 'clock_fixes_3.4rc', 'clockdomain_fixes_3.4rc', 'hsmmc_erratum_2_1_1_128_refine_3.4rc1', 'hwmod_data_fixes_a_3.4rc', 'hwmod_fixes_a2_3.4rc' and 'powerdomain_fixes_a_3.4rc' into omap-fixes-a2-for-3.4rc-branch