aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-08-24 10:10:13 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-24 10:10:13 -0700
commit1a7c55368c7c8749aa9326c29a50e79a4eba5d26 (patch)
treeabbbfe79f7362a2f2d2fa478c57f943514338ae2 /drivers/media
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc (diff)
parentsparc64: Get rid of indirect p1275 PROM call buffer. (diff)
downloadlinux-dev-1a7c55368c7c8749aa9326c29a50e79a4eba5d26.tar.xz
linux-dev-1a7c55368c7c8749aa9326c29a50e79a4eba5d26.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: sparc64: Get rid of indirect p1275 PROM call buffer. sparc64: Fill a missing delay slot. sparc64: Make lock backoff really a NOP on UP builds. sparc64: simple microoptimizations for atomic functions sparc64: Make rwsems 64-bit. sparc64: Really fix atomic64_t interface types.
Diffstat (limited to 'drivers/media')
0 files changed, 0 insertions, 0 deletions