Andy Walls
47399d98e7
V4L/DVB: gspca_cpia1: Disable illuminator controls if not an Intel Play QX3 ...
The illuminator controls should only be available to the user for the Intel
Play QX3 microscope. The implementation to inhibit the controls is intended to
be consistent with the other gspca driver implementations.
Signed-off-by: Andy Walls <awalls@md.metrocast.net>
Signed-off-by: Jean-François Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2010-10-21 01:05:55 -02:00
Merge branch 'msi-dmi' into release
2010-10-08 22:37:46 -04:00
ahci: fix module refcount breakage introduced by libahci split
2010-09-28 15:14:51 -04:00
ATM: iphase, remove sleep-inside-atomic
2010-10-11 11:05:42 -07:00
PM: Prevent waiting forever on asynchronous resume after failing suspend
2010-09-09 00:49:43 +02:00
ps3disk: passing wrong variable to bvec_kunmap_irq()
2010-10-12 18:56:33 +02:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
2010-08-06 12:25:06 -07:00
block: push down BKL into .open and .release
2010-08-07 18:25:34 +02:00
virtio: console: Don't block entire guest if host doesn't read data
2010-10-20 13:18:04 -07:00
cpuidle: Fix typos
2010-09-28 23:30:38 -04:00
[S390] zcrypt: fix Kconfig dependencies
2010-08-13 10:06:54 +02:00
dca: disable dca on IOAT ver.3.0 multiple-IOH platforms
2010-09-17 20:08:21 -07:00
ioat2: fix performance regression
2010-10-13 15:43:10 -07:00
i7core_edac: fix panic in udimm sysfs attributes registration
2010-10-01 10:50:58 -07:00
firewire: ohci: fix TI TSB82AA2 regression since 2.6.35
2010-10-17 14:09:12 +02:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
2010-08-14 12:34:34 -07:00
gpio: sx150x: correct and refine reset-on-probe behavior
2010-09-09 18:57:24 -07:00
drm/radeon/kms: avivo cursor workaround applies to evergreen as well
2010-10-18 09:14:35 +10:00
HID: Add Cando touch screen 15.6-inch product id
2010-10-13 10:47:32 +02:00
hwmon: f71882fg: use a muxed resource lock for the Super I/O port
2010-10-03 05:57:04 -07:00
i2c-imx: do not allow interruptions when waiting for I2C to complete
2010-10-18 01:29:04 +01:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6
2010-09-19 11:06:34 -07:00
intel_idle: enable Atom C6
2010-10-08 22:16:27 -04:00
ieee1394: Adjust confusing if indentation
2010-08-05 23:26:30 +02:00
RDMA/cxgb3: Turn off RX coalescing for iWARP connections
2010-09-27 09:28:55 -07:00
Input: evdev - fix EVIOCSABS regression
2010-10-18 08:45:08 -07:00
isdn: strcpy() => strlcpy()
2010-10-08 10:21:22 -07:00
leds: leds-ns2: fix locking
2010-09-19 22:43:42 -04:00
via-pmu: Add compat_pmu_ioctl
2010-08-24 15:28:28 +10:00
md: check return code of read_sb_page
2010-10-07 12:02:50 +11:00
V4L/DVB: gspca_cpia1: Disable illuminator controls if not an Intel Play QX3
2010-10-21 01:05:55 -02:00
memstick: fix hangs on unexpected device removal in mspro_blk
2010-08-12 08:43:31 -07:00
fusion: add function parameter names to kernel-doc
2010-08-14 16:21:00 -07:00
mfd: Fix max8925 irq control bit incorrect setting
2010-09-29 10:14:53 +02:00
i2c: Remove obsolete cleanup for clientdata
2010-09-30 14:14:22 +02:00
mmc: sdio: fix SDIO suspend/resume regression
2010-10-15 12:54:55 -04:00
mxc_nand: do not depend on disabling the irq in the interrupt handler
2010-10-18 13:09:05 -07:00
ehea: Fix a checksum issue on the receive path
2010-10-13 14:24:59 -07:00
of/device: Replace struct of_device with struct platform_device
2010-08-06 09:25:50 -06:00
oprofile: fix crash when accessing freed task structs
2010-08-25 09:09:09 +02:00
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
2010-08-12 09:11:31 -07:00
Merge branch 'meego-7093' into idle-release
2010-09-28 23:30:58 -04:00
pcmcia: pd6729: Fix error path
2010-09-26 15:54:25 +02:00
IPS driver: Fix limit clamping when reducing CPU power
2010-10-05 14:59:35 -04:00
apm_power: Add missing break statement
2010-09-08 14:35:10 +04:00
Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
2010-10-07 13:44:30 -07:00
i2c: Remove obsolete cleanup for clientdata
2010-09-30 14:14:22 +02:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
2010-09-28 12:01:26 -07:00
of/device: Replace struct of_device with struct platform_device
2010-08-06 09:25:50 -06:00
[SCSI] Fix VPD inquiry page wrapper
2010-09-16 11:48:48 -04:00
SERIAL: ioc3_serial: Return -ENOMEM on memory allocation failure
2010-10-19 18:32:40 +01:00
of/spi: Fix OF-style driver binding of spi devices
2010-10-02 21:28:29 -06:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
2010-08-06 12:25:06 -07:00
V4L/DVB: cx25821: fix gcc warning when compiled with allyesconfig
2010-10-21 01:04:52 -02:00
uio: Remove IRQF_DISABLED flag from uio_cif.c
2010-08-05 13:53:33 -07:00
USB: update Kconfig help text for CONFIG_USB_SUSPEND
2010-09-24 11:05:01 -07:00
vhost: fix log ctx signalling
2010-09-22 16:21:33 +02:00
Merge master.kernel.org:/home/rmk/linux-2.6-arm
2010-09-27 12:32:36 -07:00
watchdog: Enable NXP LPC32XX support in Kconfig (resend)
2010-09-15 18:43:58 +00:00
xen: do not set xenstored_ready before xenbus_probe on hvm
2010-10-05 13:37:28 +01:00
zorro: Fix reading of proc/bus/zorro/* in small chunks
2010-08-09 21:14:08 +02:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
2010-09-17 10:23:08 -07:00
47399d98e7