黄涛 237861ff51 Merge remote-tracking branch 'kernel-2.6.32/develop' into develop-2.6.36 ...

Conflicts:
	.gitignore
	arch/arm/include/asm/mach/map.h
	arch/arm/mach-rk29/vpu_service.c
	drivers/base/power/main.c
	drivers/gpio/Makefile
	drivers/input/touchscreen/Kconfig
	drivers/media/video/Kconfig
	drivers/media/video/gc0309.c
	drivers/media/video/gc2015.c
	drivers/mfd/Kconfig
	drivers/mfd/Makefile
	drivers/regulator/Kconfig
	drivers/regulator/Makefile
	drivers/usb/gadget/f_mass_storage.c
	drivers/video/Kconfig

2011-08-23 14:51:45 +08:00

..

88pm860x_onkey.c

Input: 88pm860x_onkey - remove invalid irq number assignment

2010-05-19 10:14:10 -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

Input: add Analog Devices AD714x captouch input driver

2010-04-13 23:27:16 -07:00

ad714x.c

fix typos concerning "initiali[zs]e"

2010-06-16 18:05:05 +02:00

ad714x.h

Input: add Analog Devices AD714x captouch input driver

2010-04-13 23:27:16 -07:00

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

Input: make i2c device ids constant

2010-01-09 23:28:33 -08:00

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

ati_remote.c

USB: rename usb_buffer_alloc() and usb_buffer_free() users

2010-05-20 13:21:38 -07:00

atlas_btns.c

Input: atlas_btns - switch to using pr_err() and friends

2010-07-13 09:43:24 -07:00

bfin_rotary.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

capella_cm3602.c

默认情况下关闭psensor

2010-09-22 09:13:08 +08:00

cm109.c

USB: rename usb_buffer_alloc() and usb_buffer_free() users

2010-05-20 13:21:38 -07:00

cobalt_btns.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

dm355evm_keys.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

gpio_axis.c

Revert "Input: Generic GPIO Input device."

2011-07-30 22:56:11 +08:00

gpio_event.c

Revert "Input: Generic GPIO Input device."

2011-07-30 22:56:11 +08:00

gpio_input.c

Revert "Input: Generic GPIO Input device."

2011-07-30 22:56:11 +08:00

gpio_matrix.c

Revert "Input: Generic GPIO Input device."

2011-07-30 22:56:11 +08:00

gpio_output.c

Revert "Input: Generic GPIO Input device."

2011-07-30 22:56:11 +08:00

hp_sdc_rtc.c

hp_sdc_rtc: fix broken ioctl conversion

2010-06-08 22:23:21 +02:00

isl29028.c

l/p sensor: modify l/p sensor for rk29 phonesdk

2011-08-11 19:40:00 -07:00

isl29028.h

update l/p sensor isl29028 driver for phonesdk

2011-03-02 03:26:12 -08: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

Kconfig

Merge remote-tracking branch 'remotes/tegra/android-tegra-2.6.36-honeycomb-mr1' into develop-2.6.36

2011-08-01 00:04:45 +08:00

keychord.c

Revert "input: keychord: Add keychord driver"

2011-07-30 22:53:41 +08:00

keyspan_remote.c

USB: rename usb_buffer_alloc() and usb_buffer_free() users

2010-05-20 13:21:38 -07:00

m68kspkr.c

get rid of input BIT* duplicate defines

2007-10-19 11:53:42 -07:00

Makefile

Merge remote-tracking branch 'remotes/tegra/android-tegra-2.6.36-honeycomb-mr1' into develop-2.6.36

2011-08-01 00:04:45 +08:00

max8925_onkey.c

Input: enable onkey driver of max8925

2010-05-22 00:57:59 -07:00

pcap_keys.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

pcf8574_keypad.c

Merge commit 'v2.6.35-rc3' into for-linus

2010-06-22 11:32:04 -07:00

pcf50633-input.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

pcspkr.c

i8253: Convert i8253_lock to raw_spinlock

2010-03-02 10:28:38 +01:00

powermate.c

USB: rename usb_buffer_alloc() and usb_buffer_free() users

2010-05-20 13:21:38 -07:00

pwm-beeper.c

Input: Add pwm beeper driver

2010-07-14 01:23:11 -07:00

rb532_button.c

Input: add driver for S1 button of rb532

2009-03-09 20:10:12 -07:00

rotary_encoder.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

sgi_btns.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

sparcspkr.c

of/device: Replace struct of_device with struct platform_device

2010-08-06 09:25:50 -06:00

tps65910-pwrbutton.c

cwz add tps65910 driver

2011-02-27 18:19:53 -08:00

twl4030-pwrbutton.c

Input: twl4030-pwrbutton - replace __devinit with __init

2010-07-08 21:02:55 -07:00

twl4030-vibra.c

Input: twl4030-vibra - correct the power down sequence

2010-05-22 00:58:06 -07:00

uinput.c

Input: uinput - setup MT usage during device creation

2010-09-19 16:29:57 -07:00

winbond-cir.c

Revert "Merge commit 'v2.6.32.9' into android-2.6.32"

2011-07-30 22:24:29 +08:00

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

Merge remote-tracking branch 'remotes/tegra/android-tegra-2.6.36-honeycomb-mr1' into develop-2.6.36

2011-08-01 00:04:45 +08:00

yealink.c

USB: rename usb_buffer_alloc() and usb_buffer_free() users

2010-05-20 13:21:38 -07:00

yealink.h

tree-wide: Assorted spelling fixes

2010-02-09 11:13:56 +01:00