黄涛 8aac13f440 Merge remote-tracking branch 'remotes/aosp/android-3.0' into develop-3.0 ...

Conflicts:
	drivers/mmc/card/block.c
	drivers/net/usb/asix.c
	drivers/net/wireless/airo.c
	drivers/net/wireless/ath/ath5k/base.c
	drivers/net/wireless/ath/ath9k/ar9002_calib.c
	drivers/net/wireless/ath/ath9k/ar9002_hw.c
	drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h
	drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
	drivers/net/wireless/ath/ath9k/ar9003_hw.c
	drivers/net/wireless/ath/ath9k/ar9003_phy.h
	drivers/net/wireless/ath/ath9k/hw.c
	drivers/net/wireless/ath/ath9k/hw.h
	drivers/net/wireless/ath/ath9k/init.c
	drivers/net/wireless/ath/ath9k/main.c
	drivers/net/wireless/ath/ath9k/pci.c
	drivers/net/wireless/b43/main.c
	drivers/net/wireless/hostap/hostap_main.c
	drivers/net/wireless/iwlwifi/iwl-5000.c
	drivers/net/wireless/iwlwifi/iwl-agn.c
	drivers/net/wireless/iwlwifi/iwl-core.h
	drivers/net/wireless/iwlwifi/iwl-power.c
	drivers/net/wireless/iwlwifi/iwl-scan.c
	drivers/net/wireless/iwlwifi/iwl-tx.c
	drivers/net/wireless/rt2x00/rt2800lib.c
	drivers/net/wireless/rt2x00/rt2800usb.c
	drivers/net/wireless/rt2x00/rt2x00mac.c
	drivers/net/wireless/rt2x00/rt2x00queue.c
	drivers/net/wireless/rt2x00/rt2x00queue.h
	drivers/net/wireless/rt2x00/rt2x00usb.c
	drivers/usb/serial/option.c

2011-11-09 13:06:28 +08:00

..

power

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

2011-11-09 13:06:28 +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

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

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

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

firmware loader: allow builtin firmware load even if usermodehelper is disabled

2011-10-03 11:41:07 -07:00

firmware.c

…

hypervisor.c

…

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

PM: Remove sysdev suspend, resume and shutdown operations

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

Makefile

PM / Core: Introduce struct syscore_ops for core subsystems PM

2011-03-15 00:43:46 +01:00

map.c

…

memory.c

mm: Move definition of MIN_MEMORY_BLOCK_SIZE to a header

2011-07-12 11:08:01 +10:00

module.c

driver core: module.c: Use kasprintf

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

node.c

mm: per-node vmstat: show proper vmstats

2011-05-25 08:39:07 -07: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

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

…