Merge commit 'v3.0.8' into android-3.0

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/include/asm/hardware/cache-l2x0.h
Simple merge

diff --cc drivers/mmc/core/core.c
Simple merge

diff --cc drivers/mmc/core/host.c
Simple merge

diff --cc drivers/mmc/host/sdhci.c
Simple merge

diff --cc drivers/net/Makefile
Simple merge

diff --cc drivers/net/tun.c
Simple merge

diff --cc fs/fs-writeback.c
Simple merge

diff --cc fs/fuse/dev.c
Simple merge

diff --cc include/linux/mm.h
Simple merge

diff --cc include/linux/sched.h
Simple merge

diff --cc kernel/futex.c
Simple merge

diff --cc kernel/printk.c
Simple merge

diff --cc kernel/sched.c
Simple merge

diff --cc mm/page_alloc.c
Simple merge

diff --cc net/bluetooth/hci_event.c
Simple merge

diff --cc net/ipv4/devinet.c
Simple merge

diff --cc net/ipv6/af_inet6.c
Simple merge