黄涛 6e2688ca84 Merge remote branch 'linux-2.6.32.y/master' into develop ... Conflicts: drivers/i2c/busses/Kconfig drivers/net/dm9000.c drivers/net/wireless/libertas/if_sdio1.c drivers/usb/serial/option.c net/bluetooth/rfcomm/core.c		2010-12-16 20:54:24 +08:00
..
calibrate.c	timers, init: Limit the number of per cpu calibration bootup messages	2010-01-28 15:01:14 -08:00
do_mounts.c	Driver Core: devtmpfs - kernel-maintained tmpfs-based /dev	2009-09-15 09:50:49 -07:00
do_mounts.h	md: move lots of #include lines out of .h files and into .c	2009-03-31 14:33:13 +11:00
do_mounts_initrd.c	Freezer: Fix s2disk resume from initrd	2007-11-20 22:22:42 -05:00
do_mounts_md.c	md: move lots of #include lines out of .h files and into .c	2009-03-31 14:33:13 +11:00
do_mounts_rd.c	init: make initrd/initramfs decompression failure a KERN_EMERG event	2009-01-14 11:28:35 -08:00
initramfs.c	Merge remote branch 'linux-2.6.32.y/master' into develop	2010-12-16 20:54:24 +08:00
Kconfig	ashmem for 2.6.27.	2010-02-08 15:07:23 -08:00
main.c	cpuset: fix the problem that cpuset_mem_spread_node() returns an offline node	2010-04-01 15:58:46 -07:00
Makefile	kbuild: fix make V=1	2008-02-11 17:43:54 +01:00
noinitramfs.c	[PATCH] disable init/initramfs.c	2007-02-11 10:51:25 -08:00
version.c	init/version.c: define version_string only if CONFIG_KALLSYMS is not defined	2008-07-25 10:53:29 -07:00