summaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-01-26 17:00:38 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2012-01-26 17:00:38 -0800
commitc75d5c5d82146636560ad5b91f3544ae60fc1c57 (patch)
tree2ceb03ac95dd3f7889a2d45d72f9342e52fa7583 /drivers/media
parent2d3c7efa50a4a2c1ace904d28adc3d17e5139fe1 (diff)
parente51e07e0ac7e3ff847d640f41b7527db04d4a4e7 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc: sparc32: forced setting of mode of sun4m per-cpu timers
Diffstat (limited to 'drivers/media')
0 files changed, 0 insertions, 0 deletions