summaryrefslogtreecommitdiff
path: root/include/media
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-08-25 10:40:12 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-08-25 10:40:12 -0700
commite33f2d238e2e53e264c758c0849423a9308eb63e (patch)
tree8137292b733fe0f8d10b8d004f2c58a9740c829b /include/media
parentbe5378f3baabb5667508c42c56b4281f967d6861 (diff)
parentbb0822954aab7d23a3f902c2a103ee0242f6046e (diff)
Merge branch 'urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/writeback
* 'urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/writeback: squeeze max-pause area and drop pass-good area
Diffstat (limited to 'include/media')
0 files changed, 0 insertions, 0 deletions