Vinod Koul e0d23ef29e Merge branch 'dma_slave_direction' into next_test_dirn ...

resolved conflicts:
	drivers/media/video/mx3_camera.c

2011-11-17 14:54:57 +05:30

..

altera-stapl

…

c2port

…

carma

…

cb710

…

eeprom

…

ibmasm

…

iwmc3200top

…

lis3lv02d

lis3lv02d: make regulator API usage unconditional

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

sgi-gru

…

sgi-xp

…

ti-st

…

ab8500-pwm.c

…

ad525x_dpot-i2c.c

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

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

ad525x_dpot-spi.c

…

ad525x_dpot.c

…

ad525x_dpot.h

…

apds990x.c

…

apds9802als.c

…

arm-charlcd.c

…

atmel_pwm.c

…

atmel_tclib.c

…

atmel-ssc.c

…

bh1770glc.c

…

bh1780gli.c

…

bmp085.c

…

cs5535-mfgpt.c

…

ds1682.c

…

enclosure.c

…

ep93xx_pwm.c

…

fsa9480.c

driver/misc/fsa9480.c fix potential null-pointer dereference

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

hmc6352.c

…

hpilo.c

…

hpilo.h

…

ics932s401.c

…

ioc4.c

…

isl29003.c

…

isl29020.c

…

Kconfig

Merge branch 'next/fixes' of git://git.linaro.org/people/arnd/arm-soc

2011-11-01 19:55:06 -07:00

kgdbts.c

…

lkdtm.c

…

Makefile

…

pch_phub.c

…

phantom.c

…

pti.c

…

spear13xx_pcie_gadget.c

…

ti_dac7512.c

…

tifm_7xx1.c

…

tifm_core.c

…

tsl2550.c

…

vmw_balloon.c

drivers/misc/vmw_balloon.c: fix typo in code comment

2011-11-02 16:07:03 -07:00