aboutsummaryrefslogtreecommitdiff
path: root/include/media
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-03-20 09:48:49 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-03-20 09:48:49 -0700
commit6a25a6c175bfbb4ddc879ca3070ecaacf58b1a34 (patch)
treeb26de4b88337bc9ce18a7fa4492a0ac2ba5182b0 /include/media
parentba422428295f19a3eef072b47c83202492ccab2f (diff)
parent504e75d0ed3389747e40a4aaa4b1f4e569576665 (diff)
Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6: [S390] futex: let futex_atomic_cmpxchg_pt survive early functional tests.
Diffstat (limited to 'include/media')
0 files changed, 0 insertions, 0 deletions