黄涛 1bcabbad76 Revert "temp revert rk change" ... This reverts commit 15f7fabcb8. Conflicts: .gitignore arch/arm/boot/compressed/head.S arch/arm/common/gic.c arch/arm/kernel/Makefile arch/arm/mm/proc-v7.S arch/arm/tools/mach-types arch/arm/vfp/vfphw.S drivers/Kconfig drivers/Makefile drivers/char/Makefile drivers/cpufreq/cpufreq_ondemand.c drivers/gpio/gpiolib.c drivers/gpio/tps65910-gpio.c drivers/input/Makefile drivers/input/keyboard/Kconfig drivers/input/keyboard/Makefile drivers/input/touchscreen/Kconfig drivers/media/video/Makefile drivers/media/video/ov2640.c drivers/media/video/soc_camera.c drivers/media/video/uvc/uvc_v4l2.c drivers/media/video/v4l2-ioctl.c drivers/mfd/Kconfig drivers/mfd/Makefile drivers/mfd/wm831x-core.c drivers/mfd/wm831x-i2c.c drivers/mfd/wm831x-irq.c drivers/mfd/wm831x-spi.c drivers/mfd/wm8994-core.c drivers/misc/Kconfig drivers/misc/Makefile drivers/misc/pmem.c drivers/mmc/card/block.c drivers/mmc/core/core.c drivers/mmc/core/mmc.c drivers/mmc/core/sd.c drivers/mmc/core/sdio.c drivers/mmc/host/Makefile drivers/net/wireless/Kconfig drivers/net/wireless/Makefile drivers/net/wireless/bcm4329/bcmsdh_linux.c drivers/net/wireless/bcm4329/dhd.h drivers/net/wireless/bcm4329/dhd_linux.c drivers/net/wireless/bcm4329/wl_iw.c drivers/net/wireless/bcm4329/wl_iw.h drivers/power/wm831x_power.c drivers/regulator/Makefile drivers/regulator/core.c drivers/regulator/tps65910-regulator.c drivers/regulator/wm831x-dcdc.c drivers/regulator/wm831x-isink.c drivers/regulator/wm831x-ldo.c drivers/rtc/Kconfig drivers/rtc/Makefile drivers/serial/Kconfig drivers/serial/Makefile drivers/staging/Kconfig drivers/staging/Makefile drivers/usb/Makefile drivers/usb/gadget/Kconfig drivers/usb/gadget/android.c drivers/usb/gadget/f_mass_storage.c drivers/usb/serial/option.c drivers/video/backlight/wm831x_bl.c fs/fat/dir.c fs/fat/fatent.c fs/fat/inode.c fs/yaffs2/yaffs_fs.c fs/yaffs2/yaffs_mtdif2.c include/linux/i2c.h include/linux/mfd/wm831x/core.h include/linux/mfd/wm831x/pdata.h include/linux/mfd/wm8994/core.h include/linux/mfd/wm8994/pdata.h include/linux/regulator/consumer.h include/media/v4l2-chip-ident.h kernel/power/earlysuspend.c kernel/power/wakelock.c kernel/sys.c mm/page_alloc.c sound/soc/codecs/Kconfig sound/soc/codecs/Makefile sound/soc/codecs/wm8900.c sound/soc/codecs/wm8988.c sound/soc/codecs/wm8994.c sound/soc/codecs/wm8994.h sound/soc/codecs/wm_hubs.c sound/soc/soc-cache.c		2011-11-04 17:43:18 +08:00
..
adp5588.h	Input: adp5588-keys - unify common header defines	2010-11-03 10:44:20 -07:00
adp8860.h
adp8870.h	backlight: new driver for the ADP8870 backlight devices	2011-06-15 20:03:59 -07:00
ads1015.h	hwmon: (ads1015) Make gain and datarate configurable	2011-03-21 17:59:37 +01:00
apds990x.h	drivers/misc: driver for APDS990X ALS and proximity sensors	2010-10-26 16:52:14 -07:00
at24.h
atmel_mxt_ts.h	Input: atmel_mxt_ts - allow board code to specify IRQ flags	2011-02-21 01:02:34 -08:00
bh1770glc.h	drivers/misc: driver for bh1770glc / sfh7770 ALS and proximity sensor	2010-10-26 16:52:14 -07:00
dm355evm_msp.h
ds620.h	hwmon: Support for Dallas Semiconductor DS620	2011-01-09 09:10:10 -08:00
i2c-sh_mobile.h	i2c: i2c-sh_mobile bus speed platform data V2	2011-05-11 07:08:13 +01:00
lm8323.h
ltc4245.h
max732x.h
max6639.h	hwmon: Driver for Maxim MAX6639	2011-03-14 22:36:24 -07:00
mcs.h	Input: mcs_touchkey - add support for suspend/resume	2011-02-23 21:43:31 -08:00
mpr121_touchkey.h	Input: add driver FSL MPR121 capacitive touch sensor	2011-05-12 08:28:58 -07:00
pca953x.h
pca954x.h
pcf857x.h
pmbus.h	hwmon: PMBus device driver	2011-03-14 22:36:26 -07:00
pxa-i2c.h	ARM: pxa2xx: reorganize I2C files	2011-03-21 09:09:33 +00:00
s6000.h
sx150x.h	gpio: sx150x: correct and refine reset-on-probe behavior	2010-09-09 18:57:24 -07:00
tca6424.h
tps65010.h
tsc2007.h	Input: tsc2007 - add X, Y and Z fuzz factors to platform data	2011-05-17 09:38:53 -07:00
twl.h	mfd: Fix twl6030 irq definitions	2011-05-26 19:45:40 +02:00
twl4030-madc.h	mfd: Add twl4030 madc driver	2011-03-23 10:42:00 +01:00