Programming Languages Research Group: Git - firefly-linux-kernel-4.4.55.git/commit

projects / firefly-linux-kernel-4.4.55.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: e32c146 b0af8df)

author	Colin Cross <ccross@android.com>
	Wed, 29 Jun 2011 20:54:42 +0000 (13:54 -0700)
committer	Colin Cross <ccross@android.com>
	Wed, 29 Jun 2011 20:54:42 +0000 (13:54 -0700)
commit	e55d4fa96762fd767a3b6d842c904e994db6bb2e
tree	c74157e01cb128cb97f106a50cfadc4c8b872c41	tree \| snapshot
parent	e32c14667e4fe9f16ac9b918d15d29abd2315a55	commit \| diff
parent	b0af8dfdd67699e25083478c63eedef2e72ebd85	commit \| diff

Merge commit 'v3.0-rc5' into android-3.0

19 files changed:

Documentation/cgroups/cpuacct.txt	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/compressed/head.S	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/entry-armv.S	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/traps.c	diff1 \|	diff2 \|	blob \| history
block/genhd.c	diff1 \|	diff2 \|	blob \| history
drivers/base/power/main.c	diff1 \|	diff2 \|	blob \| history
drivers/cpufreq/cpufreq_stats.c	diff1 \|	diff2 \|	blob \| history
drivers/input/evdev.c	diff1 \|	diff2 \|	blob \| history
drivers/leds/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/mmc/card/block.c	diff1 \|	diff2 \|	blob \| history
drivers/mmc/core/core.c	diff1 \|	diff2 \|	blob \| history
drivers/mmc/core/sdio.c	diff1 \|	diff2 \|	blob \| history
drivers/mmc/core/sdio_bus.c	diff1 \|	diff2 \|	blob \| history
fs/proc/base.c	diff1 \|	diff2 \|	blob \| history
init/Kconfig	diff1 \|	diff2 \|	blob \| history
mm/shmem.c	diff1 \|	diff2 \|	blob \| history
net/bluetooth/hci_event.c	diff1 \|	diff2 \|	blob \| history
net/bluetooth/sco.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/af_inet.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.