Mark Brown e4862f2f6f Merge branch 'for-2.6.36' into for-2.6.37 ... Fairly simple conflicts, the most serious ones are the i.MX ones which I suspect now need another rename. Conflicts: arch/arm/mach-mx2/clock_imx27.c arch/arm/mach-mx2/devices.c arch/arm/mach-omap2/board-rx51-peripherals.c arch/arm/mach-omap2/board-zoom2.c sound/soc/fsl/mpc5200_dma.c sound/soc/fsl/mpc5200_dma.h sound/soc/fsl/mpc8610_hpcd.c sound/soc/pxa/spitz.c		2010-08-16 18:42:58 +01:00
..
88pm860x_onkey.c	…
Kconfig	Input: Add pwm beeper driver	2010-07-14 01:23:11 -07:00
Makefile	Input: Add pwm beeper driver	2010-07-14 01:23:11 -07:00
ad714x-i2c.c	i2c: Remove all i2c_set_clientdata(client, NULL) in drivers	2010-06-03 11:33:58 +02:00
ad714x-spi.c	…
ad714x.c	fix typos concerning "initiali[zs]e"	2010-06-16 18:05:05 +02:00
ad714x.h	…
adxl34x-i2c.c	Input: adxl34 - make enable/disable separate from suspend/resume	2010-07-03 13:13:21 -07:00
adxl34x-spi.c	Input: adxl34 - make enable/disable separate from suspend/resume	2010-07-03 13:13:21 -07:00
adxl34x.c	Input: adxl34x - do not mark device as disabled on startup	2010-08-05 10:07:31 -07:00
adxl34x.h	Input: adxl34 - make enable/disable separate from suspend/resume	2010-07-03 13:13:21 -07:00
apanel.c	…
ati_remote.c	…
ati_remote2.c	param: use ops in struct kernel_param, rather than get and set fns directly	2010-08-11 23:04:13 +09:30
atlas_btns.c	Input: atlas_btns - switch to using pr_err() and friends	2010-07-13 09:43:24 -07:00
bfin_rotary.c	…
cm109.c	…
cobalt_btns.c	…
dm355evm_keys.c	…
hp_sdc_rtc.c	hp_sdc_rtc: fix broken ioctl conversion	2010-06-08 22:23:21 +02:00
ixp4xx-beeper.c	ixp4xx-beeper: Use IRQF_NO_SUSPEND not IRQF_TIMER for non-timer interrupt	2010-07-29 13:24:57 +02:00
keyspan_remote.c	…
m68kspkr.c	…
max8925_onkey.c	Input: enable onkey driver of max8925	2010-05-22 00:57:59 -07:00
pcap_keys.c	…
pcf8574_keypad.c	Merge commit 'v2.6.35-rc3' into for-linus	2010-06-22 11:32:04 -07:00
pcf50633-input.c	…
pcspkr.c	…
powermate.c	…
pwm-beeper.c	Input: Add pwm beeper driver	2010-07-14 01:23:11 -07:00
rb532_button.c	…
rotary_encoder.c	…
sgi_btns.c	…
sparcspkr.c	of/device: Replace struct of_device with struct platform_device	2010-08-06 09:25:50 -06:00
twl4030-pwrbutton.c	Input: twl4030-pwrbutton - replace __devinit with __init	2010-07-08 21:02:55 -07:00
twl4030-vibra.c	ASoC: multi-component - ASoC Multi-Component Support	2010-08-12 14:00:00 +01:00
uinput.c	Input: switch to input_abs_*() access functions	2010-08-02 20:29:56 -07:00
winbond-cir.c	…
wistron_btns.c	Input: wistron_btns - fix a memory leak in wb_module_init error path	2010-06-28 01:12:22 -07:00
wm831x-on.c	…
yealink.c	…
yealink.h	…