黄涛 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
..
acpi	Revert "Merge commit 'v2.6.32.9' into android-2.6.32"	2011-07-30 22:24:29 +08:00
asm-generic	Merge remote-tracking branch 'remotes/aosp/android-3.0' into develop-3.0	2011-10-28 16:07:07 +08:00
crypto
drm	Revert "Merge commit 'v2.6.32.9' into android-2.6.32"	2011-07-30 22:24:29 +08:00
keys	Revert "Merge remote-tracking branch 'linux-2.6.32.y/master' into develop"	2011-07-30 16:09:59 +08:00
linux	Revert "temp revert rk change"	2011-11-04 17:43:18 +08:00
math-emu	Revert "Merge remote branch 'linux-2.6.32.y/master' into develop"	2011-07-30 16:24:52 +08:00
media	Revert "temp revert rk change"	2011-11-04 17:43:18 +08:00
mtd
net	revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36	2011-10-28 16:02:47 +08:00
pcmcia
rdma	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband	2011-05-26 12:13:57 -07:00
rxrpc
scsi	Revert "Merge commit 'v2.6.32.9' into android-2.6.32"	2011-07-30 22:24:29 +08:00
sound	Merge remote-tracking branch 'remotes/aosp/android-3.0' into develop-3.0	2011-10-28 16:07:07 +08:00
target
trace	Revert "Merge commit 'v2.6.32.9' into android-2.6.32"	2011-07-30 22:24:29 +08:00
video	revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36	2011-10-28 16:02:47 +08:00
xen	revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36	2011-10-28 16:02:47 +08:00
Kbuild