黄涛 4e93666a92 Merge remote-tracking branch 'aosp/android-3.0' into develop-3.0 ...

Conflicts:
	drivers/cpufreq/cpufreq_interactive.c
	drivers/net/wireless/bcmdhd/dhd_linux.c
	drivers/net/wireless/bcmdhd/wl_cfg80211.c
	scripts/Kbuild.include

2013-01-17 15:14:24 +08:00

..

binder.c

binder: Fix memory corruption via page aliasing

2011-06-14 09:09:30 -07:00

binder.h

Revert "Staging: android: delete android drivers"

2011-06-14 09:08:38 -07:00

Kconfig

Revert "Staging: android: mark subsystem as broken"

2011-06-14 09:08:38 -07:00

logger.c

staging: logger: hold mutex while removing reader

2013-01-16 13:36:46 -08:00

logger.h

android: logger: Allow a UID to read it's own log entries

2012-03-21 16:12:05 -07:00

lowmemorykiller.c

android: lowmemorykiller: Fix arguments to lowmem_shrink

2011-06-22 16:21:45 -07:00

Makefile

Revert "Staging: android: delete android drivers"

2011-06-14 09:08:38 -07:00

ram_console.c

ram_console: set CON_ANYTIME console flag

2012-01-12 15:58:33 -08:00

timed_gpio.c

Revert "temp revert rk change"

2011-11-04 17:43:18 +08:00

timed_gpio.h

Revert "temp revert rk change"

2011-11-04 17:43:18 +08:00

timed_output.c

Staging: android: timed_gpio: Properly discard invalid timeout values.

2011-06-14 09:09:29 -07:00

timed_output.h

Revert "Staging: android: delete android drivers"

2011-06-14 09:08:38 -07:00