OSDN Git Service

Merge remote branch 'stable/linux-2.6.35.y' into android-2.6.35
authorDima Zavin <dima@android.com>
Fri, 8 Oct 2010 21:37:48 +0000 (14:37 -0700)
committerDima Zavin <dima@android.com>
Fri, 8 Oct 2010 21:37:48 +0000 (14:37 -0700)
commit4f1f1d48bb9beb281963542ad0ef6020b49eae3f
tree6a494139fbeb98a57f35478ff60c7c7f7ee76720
parentcf1fb10f6da01e3eb7b35151629df153ee165c30
parentea8a52f9f4bcc3420c38ae07f8378a2f18443970
Merge remote branch 'stable/linux-2.6.35.y' into android-2.6.35

Conflicts:
drivers/mmc/core/core.c

Change-Id: If12b25725eccb07b385f5898be75d052ff75a3f2
15 files changed:
drivers/base/power/main.c
drivers/char/mem.c
drivers/mmc/core/core.c
drivers/mtd/nand/nand_base.c
include/linux/mm.h
include/linux/mmc/host.h
include/linux/sched.h
include/net/tcp.h
kernel/fork.c
kernel/sched.c
mm/page_alloc.c
net/Kconfig
net/ipv4/devinet.c
net/ipv4/tcp.c
net/l2tp/l2tp_eth.c