黄涛 ee25a425b9 Merge tag 'lsk-android-14.05' into develop-3.10 ...

lsk 14.05 android release

Conflicts:
	arch/arm/common/Kconfig
	arch/arm64/include/asm/arch_timer.h
	drivers/staging/android/fiq_debugger/fiq_debugger.c
	drivers/usb/Kconfig

2014-06-12 21:04:26 +08:00

..

3g_module

1.add mt6229 power on/off on settings for MID

2013-03-30 15:39:47 +08:00

altera-stapl

Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

2011-10-31 15:42:54 -07:00

bp

add support for huawei e1230s/e1220s

2013-09-06 16:16:31 +08:00

c2port

misc/c2port: convert to idr_alloc()

2013-02-27 19:10:17 -08:00

carma

dmaengine: remove dma_async_memcpy_pending() macro

2013-01-07 22:05:09 -08:00

cb710

rk: revert 20f3d0b+v3.0.66 to v3.0

2013-11-08 21:34:05 +08:00

eeprom

misc: eeprom_93xx46: use spi_get_drvdata() and spi_set_drvdata()

2013-04-05 15:38:31 -07:00

gps

gps:add gps support for rk2928 and rk3066b

2012-09-17 21:53:32 +08:00

ibmasm

fs: Limit sys_mount to only request filesystem modules.

2013-03-03 19:36:31 -08:00

inv_mpu

on 977 add mpu config and update mpu code

2014-04-04 10:52:48 +08:00

lis3lv02d

rk: revert 20f3d0b+v3.0.66 to v3.0

2013-11-08 21:34:05 +08:00

mei

mei: me: do not load the driver if the FW doesn't support MEI interface

2014-05-06 07:55:27 -07:00

rk29_modem

3g: remove duplicate oper

2012-04-01 14:42:19 +08:00

rk2928_callpad_misc

rk2928_phonepad: remove exp gpio

2012-10-23 16:31:44 +08:00

scaler

androidcomputer: update dispaly scaler and commit tv5735 code

2013-10-29 16:07:43 +08:00

sgi-gru

drivers/misc/sgi-gru/grufile.c: fix info leak in gru_get_config_info()

2013-06-12 16:29:46 -07:00

sgi-xp

rk: revert 20f3d0b+v3.0.66 to v3.0

2013-11-08 21:34:05 +08:00

ti-st

Merge tag 'char-misc-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc

2013-02-21 13:57:13 -08:00

vmw_vmci

Hoist memcpy_fromiovec/memcpy_toiovec into lib/

2013-05-20 10:24:22 +09:30

5v_en.c

p977: 1.tp: set int ct363_first_init_flag to static int.

2014-04-21 14:17:29 +08:00

ac_usb_switch.c

androidComputer: changed for display

2013-10-12 16:21:45 +08:00

ad525x_dpot-i2c.c

misc: remove use of __devexit

2012-11-21 12:53:32 -08:00

ad525x_dpot-spi.c

misc: remove use of __devexit

2012-11-21 12:53:32 -08:00

ad525x_dpot.c

misc: remove use of __devinit

2012-11-21 12:51:53 -08:00

ad525x_dpot.h

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

2012-01-09 12:08:59 -08:00

akm8963.c

rk3188 ds1006h: add akm8963

2013-01-29 15:26:26 +08:00

apds990x.c

misc: apds990x: add CONFIG_PM_SLEEP to suspend/resume functions

2013-03-29 08:50:52 -07:00

apds9802als.c

misc: apds9802als: Fix suspend/resume

2013-04-11 12:39:02 -07:00

arm-charlcd.c

misc: arm-charlcd: use module_platform_driver_probe()

2013-03-15 11:10:49 -07:00

atmel_pwm.c

misc: atmel_pwm: add deferred-probing support

2013-11-20 12:27:47 -08:00

atmel_tclib.c

ARM: at91/tc/clocksource: Add 32 bit variant to Timer Counter

2012-03-01 13:38:49 +01:00

atmel-ssc.c

drivers/misc: don't check resource with devm_ioremap_resource

2013-05-18 11:55:54 +02:00

bh1770glc.c

misc: bh1770glc: add CONFIG_PM_SLEEP to suspend/resume functions

2013-03-29 08:50:51 -07:00

bh1780gli.c

misc: bh1780gli: add CONFIG_PM_SLEEP to suspend/resume functions

2013-03-29 08:50:51 -07:00

bmp085-i2c.c

misc: remove use of __devinit

2012-11-21 12:51:53 -08:00

bmp085-spi.c

misc: remove use of __devinit

2012-11-21 12:51:53 -08:00

bmp085.c

misc: remove use of __devinit

2012-11-21 12:51:53 -08:00

bmp085.h

misc: add support for bmp18x chips to the bmp085 driver

2012-04-18 14:57:14 -07:00

cs5535-mfgpt.c

rk: revert 20f3d0b+v3.0.66 to v3.0

2013-11-08 21:34:05 +08:00

ds1682.c

MISC: convert drivers/misc/* to use module_i2c_driver()

2012-01-24 16:31:49 -08:00

dummy-irq.c

dummy-irq: require the user to specify an IRQ number

2013-05-16 18:08:57 -07:00

enclosure.c

SCSI: enclosure: fix WARN_ON in dual path device removing

2013-12-11 22:36:27 -08:00

ep93xx_pwm.c

misc: ep93xx_pwm: use module_platform_driver_probe()

2013-03-15 11:10:49 -07: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

fsa9480.c

misc: fsa8480: Use dev_pm_ops

2013-04-11 12:39:02 -07:00

hmc6352.c

MISC: convert drivers/misc/* to use module_i2c_driver()

2012-01-24 16:31:49 -08:00

hpilo.c

drivers/misc/hpilo: Correct panic when an AUX iLO is detected

2013-09-07 22:09:59 -07:00

hpilo.h

misc: hpilo: increase number of max supported channels

2012-06-14 17:22:12 -07:00

ics932s401.c

MISC: convert drivers/misc/* to use module_i2c_driver()

2012-01-24 16:31:49 -08:00

ioc4.c

misc: remove use of __devexit

2012-11-21 12:53:32 -08:00

isl29003.c

misc: isl29003: Use dev_pm_ops

2013-04-11 12:39:02 -07:00

isl29020.c

MISC: convert drivers/misc/* to use module_i2c_driver()

2012-01-24 16:31:49 -08:00

Kconfig

p977: support 5v en power control for otg and hdmi

2014-04-21 09:40:41 +08:00

kgdbts.c

rk: revert 20f3d0b+v3.0.66 to v3.0

2013-11-08 21:34:05 +08:00

lattice-ecp3-config.c

misc: lattice-ecp3-config: use spi_get_drvdata()

2013-04-05 15:38:31 -07:00

lkdtm.c

drivers/misc/lkdtm.c: fix missing allocation failure check

2012-07-30 17:25:22 -07:00

Makefile

p977: support 5v en power control for otg and hdmi

2014-04-21 09:40:41 +08:00

modem_sound.c

modem_sound: update modem_sound

2013-08-26 10:38:55 +08:00

modem_sound.h

add es8323 codec for pcm modem

2013-07-01 17:31:52 +08:00

mtk23d.c

A22:fix mtk23d.c compile warning

2012-01-14 10:55:48 +08:00

pch_phub.c

rk: revert 20f3d0b+v3.0.66 to v3.0

2013-11-08 21:34:05 +08:00

phantom.c

misc: remove use of __devexit

2012-11-21 12:53:32 -08:00

pti.c

Merge tag 'tty-3.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

2012-12-11 14:08:47 -08:00

sc8800.c

sc8803: update sc8800.c

2012-06-20 16:26:37 +08:00

spear13xx_pcie_gadget.c

rk: revert 20f3d0b+v3.0.66 to v3.0

2013-11-08 21:34:05 +08:00

sram.c

misc: SRAM: Add option to map SRAM to allow code execution

2013-11-21 13:39:20 +08:00

tcc_bt_dev.c

bluetooth: fix rda5876 enable irq warning

2013-05-31 14:15:11 +08:00

tdsc8800.c

modify tdsc8800 bug.

2012-06-26 09:08:00 +08:00

ti_dac7512.c

misc: remove use of __devexit

2012-11-21 12:53:32 -08:00

tifm_7xx1.c

tifm: use module_pci_driver

2012-09-05 14:10:29 -07:00

tifm_core.c

misc/tifm_core: convert to idr_alloc()

2013-02-27 19:10:17 -08:00

tsl2550.c

misc: tsl2550: Use dev_pm_ops

2013-04-11 12:39:02 -07:00

uid_stat.c

rk: revert 20f3d0b+v3.0.66 to v3.0

2013-11-08 21:34:05 +08:00

vmw_balloon.c

vmw_balloon: fix for a -Wuninitialized warning

2012-02-02 16:28:13 -08:00