aboutsummaryrefslogtreecommitdiff
path: root/drivers/media
diff options
context:
space:
mode:
authorLinus Torvalds2008-04-07 14:54:07 -0700
committerLinus Torvalds2008-04-07 14:54:07 -0700
commitff09e2afe742f3ff52a0c9a660e8a3fe30cf587c (patch)
treeaff06e82c7d653d0b15c1f3cae7f0c8a90ba3d14 /drivers/media
parentad3c7e42e33a842cf3b518e21a7f69e167649d8a (diff)
parent9c5a3d729cf430609d091ff610a7db363aafcd47 (diff)
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/ralf/upstream-linus
* 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/ralf/upstream-linus: [MIPS] Handle aliases in vmalloc correctly.
Diffstat (limited to 'drivers/media')
0 files changed, 0 insertions, 0 deletions