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

Conflicts:
	arch/arm/mm/mmu.c
	drivers/input/keyboard/Makefile
	drivers/media/video/gc0309.c
	drivers/misc/Kconfig
	drivers/mmc/core/core.c
	drivers/regulator/Kconfig
	drivers/regulator/Makefile
	drivers/usb/gadget/f_mass_storage.c
	drivers/video/backlight/Makefile
	include/linux/fb.h
	include/linux/mmc/host.h

2011-09-26 14:53:47 +08:00

..

c2port

sysfs: add struct file* to bin_attr callbacks

2010-05-21 09:37:31 -07:00

cb710

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

eeprom

i2c: Remove all i2c_set_clientdata(client, NULL) in drivers

2010-06-03 11:33:58 +02:00

gps

rk29_phone: disable pull down resistor of uart3 for gps

2011-09-14 17:29:52 +08:00

ibmasm

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

iwmc3200top

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

mpu3050

mpu3050: remove accel irq warning

2011-08-15 18:42:49 -07:00

radio_ctrl

radio_ctrl: remove host_wake from wrigley driver

2011-03-21 13:56:23 -07:00

rk29_modem

新的modem驱动

2011-07-18 17:59:11 +08:00

sgi-gru

sgi-gru: use for_each_set_bit()

2010-03-12 15:52:44 -08:00

sgi-xp

Revert "Merge remote branch 'linux-2.6.32.y/master' into develop"

2011-07-30 16:24:52 +08:00

ts27010mux

misc: ts27010: Don't wait for ack if DISC packet has been dropped

2011-01-19 17:40:19 -08:00

ad525x_dpot-i2c.c

ad525x_dpot: add support for one time programmable pots

2010-05-25 08:07:04 -07:00

ad525x_dpot-spi.c

drivers/misc/ad525x_dpot.c: fix typo in spi write16 and write24 transfer counts

2010-12-09 13:32:36 -08:00

ad525x_dpot.c

ad525x_dpot: add support for one time programmable pots

2010-05-25 08:07:04 -07:00

ad525x_dpot.h

ad525x_dpot: add support for one time programmable pots

2010-05-25 08:07:04 -07:00

akm8975.c

misc: amk8975: correct y-axis and orientation status reporting

2011-03-03 16:27:16 -08:00

apanic.c

Revert "temp revert apanice change"

2011-08-01 01:49:14 +08:00

arm-charlcd.c

ARM: 6214/2: driver for the character LCD found in ARM refdesigns

2010-07-26 10:48:28 +01:00

atmel_pwm.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

atmel_tclib.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

atmel-ssc.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

bh1780gli.c

i2c: Remove obsolete cleanup for clientdata

2010-09-30 14:14:22 +02:00

bmp085.c

drivers/misc: support for the pressure sensor BMP085 from Bosch Sensortec

2010-08-09 20:45:05 -07:00

cap_prox.c

misc:cap-prox:remove force-detect after fail-safe check

2011-04-22 15:04:55 -07:00

cs5535-mfgpt.c

cs5535-mfgpt: reuse timers that have never been set up

2010-08-11 08:59:20 -07:00

ds1682.c

sysfs: add struct file* to bin_attr callbacks

2010-05-21 09:37:31 -07:00

enclosure.c

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

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

ep93xx_pwm.c

Revert "Merge remote-tracking branch 'linux-2.6.32.y/master' into develop"

2011-07-30 16:09:59 +08:00

fm580x.c

add fm rda580x driver support

2011-05-20 23:34:37 +08:00

fm580x.h

add fm rda580x driver support

2011-05-20 23:34:37 +08:00

gps-gpio-brcm4750.c

misc: gps_brcm4750: Adding wake up timer support for Brcm gps v17 library

2011-02-09 10:37:14 -05:00

hmc6352.c

hmc6352: add driver for the HMC6352 compass

2010-08-09 20:45:10 -07:00

hpilo.c

hpilo: fix pointer warning in ilo_ccb_setup

2010-08-09 20:45:05 -07:00

hpilo.h

hpilo: fix pointer warning in ilo_ccb_setup

2010-08-09 20:45:05 -07:00

ics932s401.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

ioc4.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

isl29003.c

isl29003: fix resume functionality

2009-05-06 16:36:10 -07:00

Kconfig

Merge remote-tracking branch 'kernel-2.6.32/develop' into develop-2.6.36

2011-09-26 14:53:47 +08:00

kernel_debugger.c

Revert "kernel_debugger_core: add interrupt-context debugger core"

2011-07-30 22:44:36 +08:00

kgdbts.c

kgdbts,sh: Add in breakpoint pc offset for superh

2010-04-02 14:58:17 -05:00

kxtf9.c

rename kxtf9 to moto_kxtf9

2011-09-26 12:04:04 +08:00

l3g4200d.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

lkdtm.c

param: remove unnecessary writable charp

2010-08-11 23:04:27 +09:30

Makefile

Merge remote-tracking branch 'kernel-2.6.32/develop' into develop-2.6.36

2011-09-26 14:53:47 +08:00

max9635.c

misc: max9635: unregister upon probe failure

2011-01-25 15:58:27 -08:00

moto_bmp085.c

misc: moto_bmp085: Disable debug messages

2010-12-20 14:52:05 -08:00

mtk23d.c

modify mtk23d.c

2011-08-09 14:10:02 +08:00

mu509.c

phone-pad:update mu509 drivers

2011-09-02 15:43:04 +08:00

MW100.c

phone-pad:add mw100 modem support.

2011-09-22 13:41:45 +08:00

nct1008.c

NCT1008 temperature sensor driver

2011-01-07 18:00:41 -08:00

newton.c

newton: get all sector3 info api.

2011-08-03 01:10:03 -07:00

phantom.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

pmem.c

pmem: fix for v2.6.36

2011-08-01 11:24:07 +08:00

ste.c

1,耳机按键；2，针对raho的震动(time 精度还不行)；3，modem控制驱动；4，一些log开关的修改

2010-10-13 12:22:33 +08:00

tegra-cryptodev.c

[ARM] tegra: device node to access tegra aes hw

2011-01-17 12:49:06 -08:00

tegra-cryptodev.h

[ARM] tegra: device node to access tegra aes hw

2011-01-17 12:49:06 -08:00

ti_dac7512.c

drivers/misc: add driver for Texas Instruments DAC7512

2009-12-15 08:53:25 -08:00

tifm_7xx1.c

dma-mapping: replace all DMA_32BIT_MASK macro with DMA_BIT_MASK(32)

2009-04-07 08:31:11 -07:00

tifm_core.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

tsl2550.c

tsl2550: Move from i2c/chips to misc

2010-03-13 20:56:54 +01:00

uid_stat.c

Revert "uidstat: Adding uid stat driver to collect network statistics."

2011-07-30 22:57:02 +08:00

vmw_balloon.c

vmware balloon: rename module

2010-09-22 17:22:38 -07:00

wl127x-rfkill.c

Revert "wl127x-rfkill: Add power control driver for TI WL127X Bluetooth chips"

2011-07-30 22:43:35 +08:00