aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-09-21 08:15:18 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-09-21 08:15:18 -0700
commit33e6c1a0de818d3698cdab27c42915661011319d (patch)
tree763b8d7ab872471fad3a95a4bb8589903bb25880 /drivers/media
parentMerge branch 'linux-next' of git://git.infradead.org/ubi-2.6 (diff)
parentMerge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into linux-next (diff)
downloadlinux-dev-33e6c1a0de818d3698cdab27c42915661011319d.tar.xz
linux-dev-33e6c1a0de818d3698cdab27c42915661011319d.zip
Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6
* 'linux-next' of git://git.infradead.org/ubifs-2.6: UBIFS: fix debugging dump UBIFS: improve lprops dump UBIFS: various minor commentary fixes UBIFS: improve journal head debugging prints UBIFS: define journal head numbers in ubifs-media.h UBIFS: amend commentaries UBIFS: check ubifs_scan error codes better UBIFS: do not print scary error messages needlessly UBIFS: add inode size debugging check UBIFS: constify file and inode operations UBIFS: remove unneeded call from ubifs_sync_fs UBIFS: kill BKL UBIFS: remove unused functions UBIFS: suppress compilation warning
Diffstat (limited to 'drivers/media')
0 files changed, 0 insertions, 0 deletions