Linus Torvalds b6255ee3d8 Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media ... Pull media fixes from Mauro Carvalho Chehab: "For a some fix patches for v3.4, including a regression fix at DVB core" Fix up trivial conflicts in Documentation/feature-removal-schedule.txt * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: [media] gspca - sonixj: Fix a zero divide in isoc interrupt [media] media: videobuf2-dma-contig: include header for exported symbols [media] media: videobuf2-dma-contig: quiet sparse noise about plain integer as NULL pointer [media] media: vb2-memops: Export vb2_get_vma symbol [media] s5p-fimc: Correct memory allocation for VIDIOC_CREATE_BUFS [media] s5p-fimc: Fix locking in subdev set_crop op [media] dvb_frontend: fix a regression with DVB-S zig-zag [media] fintek-cir: change || to && [media] V4L: Schedule V4L2_CID_HCENTER, V4L2_CID_VCENTER controls for removal [media] rc: Postpone ISR registration [media] marvell-cam: fix an ARM build error [media] V4L: soc-camera: protect hosts during probing from overzealous user-space		2012-05-14 11:23:37 -07:00
..
ABI	HSI: Add HSI ABI documentation	2012-04-23 14:23:32 +03:00
DocBook	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media	2012-04-21 12:43:23 -07:00
EDID	…
PCI	…
RCU	…
accounting	…
acpi	…
aoe	Documentation: remove references to /etc/modprobe.conf	2012-03-30 16:03:15 -07:00
arm	…
auxdisplay	…
backlight	…
blackfin	…
block	…
blockdev	Documentation: remove references to /etc/modprobe.conf	2012-03-30 16:03:15 -07:00
cdrom	…
cgroups	memcg: fix up documentation on global LRU	2012-04-12 13:12:11 -07:00
connector	…
console	…
cpu-freq	…
cpuidle	…
cris	…
crypto	…
development-process	…
device-mapper	…
devicetree	sound fixes for 3.4-rc6	2012-05-05 10:07:06 -07:00
driver-model	…
dvb	…
early-userspace	…
fault-injection	…
fb	Documentation: remove references to /etc/modprobe.conf	2012-03-30 16:03:15 -07:00
filesystems	typo fix in Documentation/filesystems/vfs.txt	2012-04-09 01:39:24 -04:00
firmware_class	…
frv	…
hid	…
hwmon	hwmon: (k10temp) Add support for AMD Trinity CPUs	2012-04-01 10:25:56 -07:00
i2c	Documentation: remove references to /etc/modprobe.conf	2012-03-30 16:03:15 -07:00
i2o	…
ia64	…
ide	Documentation: remove references to /etc/modprobe.conf	2012-03-30 16:03:15 -07:00
infiniband	…
input	Documentation: input.txt: clarify mousedev 'cat' command syntax	2012-03-30 16:03:15 -07:00
ioctl	Merge branch 'for-next' of git://gitorious.org/kernel-hsi/kernel-hsi	2012-04-02 09:50:40 -07:00
isdn	Documentation: remove references to /etc/modprobe.conf	2012-03-30 16:03:15 -07:00
ja_JP	…
kbuild	Documentation: mention scripts/diffconfig tool	2012-03-30 16:03:15 -07:00
kdump	…
ko_KR	…
laptops	Documentation: remove references to /etc/modprobe.conf	2012-03-30 16:03:15 -07:00
leds	…
m68k	…
make	…
mips	…
misc-devices	…
mmc	…
mn10300	…
mtd	…
namespaces	…
netlabel	…
networking	tcp: change tcp_adv_win_scale and tcp_rmem[2]	2012-05-02 21:08:58 -04:00
nfc	…
parisc	…
pcmcia	…
power	PM / Freezer / Docs: Update documentation about freezing of tasks	2012-04-29 22:29:30 +02:00
powerpc	…
pps	…
prctl	…
pti	…
ptp	…
rapidio	…
s390	Documentation: remove references to /etc/modprobe.conf	2012-03-30 16:03:15 -07:00
scheduler	…
scsi	SCSI updates on 20120331	2012-03-31 13:31:23 -07:00
security	keys: update the documentation with info about "logon" keys	2012-04-25 12:46:50 -04:00
serial	Documentation: remove references to /etc/modprobe.conf	2012-03-30 16:03:15 -07:00
sh	…
sound	ALSA: hda/realtek - Add a few ALC882 model strings back	2012-04-11 14:10:57 +02:00
sparc	…
spi	…
sysctl	…
target	…
telephony	…
thermal	…
timers	…
trace	…
usb	USB documentation: explain lifetime rules for unlinking URBs	2012-04-06 13:54:00 -07:00
vDSO	…
video4linux	Documentation: remove references to /etc/modprobe.conf	2012-03-30 16:03:15 -07:00
virtual	…
vm	…
w1	…
watchdog	…
wimax	…
x86	…
zh_CN	…
.gitignore	…
00-INDEX	…
BUG-HUNTING	…
Changes	…
CodingStyle	Documentation: CodingStyle: add inline assembly guidelines	2012-03-30 16:03:15 -07:00
DMA-API-HOWTO.txt	…
DMA-API.txt	…
DMA-ISA-LPC.txt	…
DMA-attributes.txt	…
HOWTO	…
IPMI.txt	…
IRQ-affinity.txt	…
IRQ-domain.txt	…
IRQ.txt	…
Intel-IOMMU.txt	…
Makefile	…
ManagementStyle	…
SAK.txt	…
SM501.txt	…
SecurityBugs	…
SubmitChecklist	…
SubmittingDrivers	…
SubmittingPatches	…
VGA-softcursor.txt	…
applying-patches.txt	…
atomic_ops.txt	…
bad_memory.txt	…
basic_profiling.txt	…
binfmt_misc.txt	…
braille-console.txt	…
bt8xxgpio.txt	…
btmrvl.txt	…
bus-virt-phys-mapping.txt	…
cachetlb.txt	…
circular-buffers.txt	…
clk.txt	…
coccinelle.txt	…
cpu-hotplug.txt	…
cpu-load.txt	…
cputopology.txt	…
crc32.txt	…
dcdbas.txt	…
debugging-modules.txt	…
debugging-via-ohci1394.txt	…
dell_rbu.txt	…
devices.txt	…
digsig.txt	…
dma-buf-sharing.txt	…
dmaengine.txt	…
dontdiff	Documentation: remove 'mach' from dontdiff file	2012-03-30 16:03:15 -07:00
dynamic-debug-howto.txt	…
edac.txt	…
eisa.txt	…
email-clients.txt	…
feature-removal-schedule.txt	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media	2012-05-14 11:23:37 -07:00
flexible-arrays.txt	…
futex-requeue-pi.txt	…
gcov.txt	…
gpio.txt	…
highuid.txt	…
hw_random.txt	…
hwspinlock.txt	…
init.txt	…
initrd.txt	…
intel_txt.txt	…
io-mapping.txt	…
io_ordering.txt	…
iostats.txt	…
irqflags-tracing.txt	…
isapnp.txt	…
java.txt	…
kernel-doc-nano-HOWTO.txt	…
kernel-docs.txt	…
kernel-parameters.txt	…
kmemcheck.txt	…
kmemleak.txt	…
kobject.txt	…
kprobes.txt	…
kref.txt	…
ldm.txt	…
local_ops.txt	…
lockdep-design.txt	…
lockstat.txt	…
lockup-watchdogs.txt	…
logo.gif	…
logo.txt	…
magic-number.txt	…
mca.txt	…
md.txt	…
media-framework.txt	…
memory-barriers.txt	…
memory-hotplug.txt	…
memory.txt	…
mono.txt	Documentation: remove references to /etc/modprobe.conf	2012-03-30 16:03:15 -07:00
mutex-design.txt	…
nommu-mmap.txt	…
numastat.txt	…
oops-tracing.txt	…
padata.txt	…
parport-lowlevel.txt	…
parport.txt	Documentation: remove references to /etc/modprobe.conf	2012-03-30 16:03:15 -07:00
pi-futex.txt	…
pinctrl.txt	…
pnp.txt	…
preempt-locking.txt	…
printk-formats.txt	…
prio_tree.txt	…
ramoops.txt	…
rbtree.txt	…
remoteproc.txt	…
rfkill.txt	…
robust-futex-ABI.txt	…
robust-futexes.txt	…
rpmsg.txt	…
rt-mutex-design.txt	…
rt-mutex.txt	…
rtc.txt	…
serial-console.txt	…
sgi-ioc4.txt	…
sgi-visws.txt	…
sparse.txt	…
spinlocks.txt	…
stable_api_nonsense.txt	…
stable_kernel_rules.txt	…
static-keys.txt	…
svga.txt	…
sysfs-rules.txt	…
sysrq.txt	Documentation: sysrq: Crutcher Dunnavant is unavailable	2012-03-30 16:03:15 -07:00
unaligned-memory-access.txt	…
unicode.txt	…
unshare.txt	…
vgaarbiter.txt	…
video-output.txt	…
volatile-considered-harmful.txt	…
workqueue.txt	…
xz.txt	…
zorro.txt	…