summaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-04-05 00:09:44 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-05 00:09:44 +0200
commit6fdf5e67fe8d3c83500dad9acae985132c2459a3 (patch)
treec6cb9c0b22c4d22e4c65a40c0851aff5eedf7cd5 /drivers/media
parentipmi: change device node ordering to reflect probe order (diff)
parent[MIPS] Make KGDB compile on UP (diff)
downloadlinux-6fdf5e67fe8d3c83500dad9acae985132c2459a3.tar.xz
linux-6fdf5e67fe8d3c83500dad9acae985132c2459a3.zip
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] Make KGDB compile on UP [MIPS] Pb1200: Fix header breakage
Diffstat (limited to 'drivers/media')
0 files changed, 0 insertions, 0 deletions