黄涛 21158e22d9 Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0 ...

Conflicts:
	Makefile
	drivers/mmc/core/sd.c
	drivers/net/usb/asix.c
	drivers/net/wireless/ath/ath9k/recv.c
	drivers/net/wireless/b43legacy/main.c
	drivers/net/wireless/p54/p54usb.c
	drivers/net/wireless/rt2x00/rt2400pci.c
	drivers/net/wireless/rt2x00/rt2400pci.h
	drivers/net/wireless/rt2x00/rt2500pci.c
	drivers/net/wireless/rt2x00/rt2500usb.c
	drivers/net/wireless/rt2x00/rt2500usb.h
	drivers/net/wireless/rt2x00/rt2800pci.c
	drivers/net/wireless/rt2x00/rt2800usb.c
	drivers/net/wireless/rt2x00/rt61pci.c
	drivers/net/wireless/rt2x00/rt61pci.h
	drivers/net/wireless/rt2x00/rt73usb.c
	drivers/net/wireless/rt2x00/rt73usb.h
	drivers/net/wireless/rtl818x/rtl8187/dev.c
	drivers/usb/serial/option.c
	kernel/time/timekeeping.c

2012-10-08 10:28:29 +08:00

..

power

Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0

2012-10-08 10:28:29 +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

PM: Remove sysdev suspend, resume and shutdown operations

2011-05-11 21:37:15 +02:00

bus.c

Merge remote-tracking branch 'remotes/aosp/android-3.0' into develop-3.0

2011-10-28 16:07:07 +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

PM / Driver core: leave runtime PM enabled during system shutdown

2012-03-19 08:57:44 -07: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

Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6

2011-05-19 18:24:11 -07:00

devices_filter.h

3g dongle

2012-06-02 17:23:59 +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

firmware: Fix an oops on reading fw_priv->fw in sysfs loading file

2012-01-12 11:34:55 -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

sw_sync: add cpu based sync driver

2012-04-18 14:08:08 -07:00

Makefile

sw_sync: add cpu based sync driver

2012-04-18 14:08:08 -07:00

map.c

[PATCH] kobj_map semaphore to mutex conversion

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

memory.c

mm: memory hotplug: Check if pages are correctly reserved on a per-section basis

2012-08-01 12:26:55 -07:00

module.c

driver core: module.c: Use kasprintf

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

node.c

drivers/base/node.c: fix compilation error with older versions of gcc

2011-11-26 09:09:59 -08:00

platform.c

drivers/base/platform.c: don't mark platform_device_register_resndata() as __init_or_module

2011-06-07 10:01:17 -07:00

sw_sync.c

sw_sync: add fill_driver_data support

2012-04-18 14:11:47 -07:00

sync.c

sync: add poll support

2012-04-18 14:11:52 -07:00

sys.c

PM: Remove sysdev suspend, resume and shutdown operations

2011-05-11 21:37:15 +02:00

syscore.c

PM: Reintroduce dropped call to check_wakeup_irqs

2011-07-11 10:51:49 +02:00

topology.c

topology/sysfs: Provide book id and siblings attributes

2010-09-09 20:41:25 +02:00

transport_class.c

SCSI: convert struct class_device to struct device

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