Peter Korsgaard aaaa287b89 drivers/misc/ad525x_dpot-i2c.c: add i2c support for AD5161 ...

Commit 6c536e4ce8 ("ad525x_dpot: add support for SPI parts") added
support for the AD5161 through SPI, but the device supports both I2C and
SPI (depending on the DIS pin), so add it to -i2c as well.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Acked-by: Mike Frysinger <vapier@gentoo.org>
Acked-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

2011-10-31 17:30:53 -07:00

..

accessibility

…

acpi

Merge branch 'next-rebase' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci

2011-10-28 14:20:44 -07:00

amba

…

ata

Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

2011-10-28 16:44:18 -07:00

atm

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

2011-10-25 13:25:22 +02:00

auxdisplay

…

base

Merge branch 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

2011-10-25 15:18:39 +02:00

bcma

…

block

Merge branch 'for-linus' of git://ceph.newdream.net/git/ceph-client

2011-10-28 16:42:18 -07:00

bluetooth

Merge branch 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

2011-10-25 15:18:39 +02:00

cdrom

…

char

Merge branch 'drm-core-next' of git://people.freedesktop.org/~airlied/linux

2011-10-28 05:54:23 -07:00

clk

…

clocksource

Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2011-10-26 17:15:03 +02:00

connector

…

cpufreq

Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2011-10-26 17:15:03 +02:00

cpuidle

…

crypto

…

dca

…

devfreq

…

dio

…

dma

…

edac

…

eisa

…

firewire

…

firmware

…

gpio

Merge branch 'gpio/next' of git://git.secretlab.ca/git/linux-2.6

2011-10-29 07:27:45 -07:00

gpu

Merge branch 'drm-core-next' of git://people.freedesktop.org/~airlied/linux

2011-10-28 05:54:23 -07:00

hid

Merge branch 'next' into for-linus

2011-10-26 21:46:20 -07:00

hv

…

hwmon

drivers/hwmon/hwmon.c: convert idr to ida and use ida_simple_get()

2011-10-31 17:30:51 -07:00

hwspinlock

…

i2c

i2c-algo-pca: Return standard fault codes

2011-10-30 13:47:25 +01:00

ide

Merge branch 'gpio' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm

2011-10-27 08:39:10 +02:00

idle

…

ieee802154

…

infiniband

mm: distinguish between mlocked and pinned pages

2011-10-31 17:30:46 -07:00

input

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

2011-10-28 14:25:01 -07:00

iommu

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu

2011-10-30 15:46:19 -07:00

isdn

Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

2011-10-26 15:11:09 +02:00

leds

Merge branch 'x86-geode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2011-10-28 05:04:26 -07:00

lguest

lguest: move process freezing before pending signals check

2011-10-27 10:56:18 +10:30

macintosh

…

mca

…

md

Merge branch 'for-linus' of git://neil.brown.name/md

2011-10-31 15:21:29 -07:00

media

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu

2011-10-30 15:46:19 -07:00

memstick

…

message

…

mfd

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

2011-10-28 14:25:01 -07:00

misc

drivers/misc/ad525x_dpot-i2c.c: add i2c support for AD5161

2011-10-31 17:30:53 -07:00

mmc

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc

2011-10-28 14:16:11 -07:00

mtd

Merge branch 'gpio' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm

2011-10-27 08:39:10 +02:00

net

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2011-10-31 15:22:44 -07:00

nfc

…

nubus

…

of

of_mdio: Don't phy_scan_fixups() twice

2011-10-25 06:55:52 +02:00

oprofile

…

parisc

…

parport

…

pci

Merge branch 'next-rebase' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci

2011-10-28 14:20:44 -07:00

pcmcia

Merge branch 'gpio' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm

2011-10-27 08:39:10 +02:00

pinctrl

pinctrl/sirf: fix sirfsoc_get_group_pins prototype

2011-10-25 10:43:57 +02:00

platform

lis3: change exported function to use passed parameter

2011-10-31 17:30:52 -07:00

pnp

…

power

…

pps

…

ps3

…

ptp

…

rapidio

…

regulator

…

rtc

…

s390

Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

2011-10-28 16:44:18 -07:00

sbus

…

scsi

Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

2011-10-28 16:44:18 -07:00

sfi

…

sh

…

sn

…

spi

Merge branch 'spi/next' of git://git.secretlab.ca/git/linux-2.6

2011-10-29 07:28:36 -07:00

ssb

…

staging

Merge branch 'fbdev-next' of git://github.com/schandinat/linux-2.6

2011-10-30 15:30:01 -07:00

target

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2011-10-25 12:11:02 +02:00

tc

…

telephony

…

thermal

…

tty

Merge branch 'spi/next' of git://git.secretlab.ca/git/linux-2.6

2011-10-29 07:28:36 -07:00

uio

…

usb

Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm

2011-10-28 12:02:27 -07:00

uwb

…

vhost

…

video

Merge branch 'fbdev-next' of git://github.com/schandinat/linux-2.6

2011-10-30 15:30:01 -07:00

virt

…

virtio

Add ethtool -g support to virtio_net

2011-10-24 02:07:21 -04:00

vlynq

…

w1

…

watchdog

Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2011-10-26 17:03:38 +02:00

xen

Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2011-10-26 16:44:09 +02:00

zorro

zorro: Fix four checkpatch warnings

2011-10-24 21:00:34 +02:00

Kconfig

Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging

2011-10-26 15:39:02 +02:00

Makefile

Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging

2011-10-26 15:39:02 +02:00