黄涛 d120da9fa2 Merge remote-tracking branch 'kernel-2.6.32/develop' into develop-2.6.36 ...

Conflicts:
	arch/arm/mm/mmu.c
	drivers/input/keyboard/Makefile
	drivers/media/video/gc0309.c
	drivers/misc/Kconfig
	drivers/mmc/core/core.c
	drivers/regulator/Kconfig
	drivers/regulator/Makefile
	drivers/usb/gadget/f_mass_storage.c
	drivers/video/backlight/Makefile
	include/linux/fb.h
	include/linux/mmc/host.h

2011-09-26 14:53:47 +08:00

..

power

Merge remote-tracking branch 'kernel-2.6.32/develop' into develop-2.6.36

2011-08-24 10:22:42 +08:00

attribute_container.c

[SCSI] attirbute_container: Initialize sysfs attributes with sysfs_attr_init

2010-03-27 15:15:24 -04:00

base.h

Driver Core: devtmpfs - kernel-maintained tmpfs-based /dev

2009-09-15 09:50:49 -07:00

bus.c

Merge remote-tracking branch 'remotes/tegra/android-tegra-2.6.36-honeycomb-mr1' into develop-2.6.36

2011-08-01 00:04:45 +08:00

class.c

Revert "Merge commit 'v2.6.32.9' into android-2.6.32"

2011-07-30 22:24:29 +08:00

core.c

Revert "Merge commit 'v2.6.32.9' into android-2.6.32"

2011-07-30 22:24:29 +08:00

cpu.c

Revert "Merge remote branch 'linux-2.6.32.y/master' into develop"

2011-07-30 16:24:52 +08:00

dd.c

Driver core: Add BUS_NOTIFY_BIND_DRIVER

2010-08-05 13:53:35 -07:00

devices_filter.h

Add some 3G dongle

2011-08-31 10:55:09 +08:00

devres.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

devtmpfs.c

Revert "Merge commit 'v2.6.32.9' into android-2.6.32"

2011-07-30 22:24:29 +08:00

dma-coherent.c

Driver core: internal struct dma_coherent_mem, change type of a member.

2010-08-05 13:53:33 -07:00

dma-mapping.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

driver.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

firmware_class.c

Revert "Merge remote branch 'linux-2.6.32.y/master' into develop"

2011-07-30 16:24:52 +08:00

firmware.c

firmware: change firmware_kset to firmware_kobj

2008-01-24 20:40:23 -08:00

hypervisor.c

kobject: convert /sys/hypervisor to use kobject_create

2008-01-24 20:40:15 -08:00

init.c

Driver Core: devtmpfs - kernel-maintained tmpfs-based /dev

2009-09-15 09:50:49 -07:00

iommu.c

iommu-api: Remove iommu_{un}map_range functions

2010-03-07 18:01:13 +01:00

isa.c

dma-mapping: replace all DMA_24BIT_MASK macro with DMA_BIT_MASK(24)

2009-04-07 08:31:12 -07:00

Kconfig

devtmpfs: support !CONFIG_TMPFS

2010-05-21 09:37:30 -07:00

Makefile

Driver Core: devtmpfs - kernel-maintained tmpfs-based /dev

2009-09-15 09:50:49 -07:00

map.c

[PATCH] kobj_map semaphore to mutex conversion

2006-03-20 13:42:58 -08:00

memory.c

Revert "memory-hotplug: add 0x prefix to HEX block_size_bytes"

2010-04-09 10:05:33 -07:00

module.c

driver core: module.c: Use kasprintf

2010-05-21 09:37:29 -07:00

node.c

drivers/base/node.c: reduce stack usage of node_read_meminfo()

2010-08-09 20:45:02 -07:00

platform.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6

2010-08-06 11:36:30 -07:00

sys.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

topology.c

topology: convert cpu notifier to return encapsulate errno value

2010-05-27 09:12:48 -07:00

transport_class.c

SCSI: convert struct class_device to struct device

2008-04-19 19:10:33 -07:00