黄涛 380873f76d Revert "Merge commit 'v2.6.32.9' into android-2.6.32" ...

This reverts commit 67078ecae3, reversing
changes made to dc136618cb.

Conflicts:

	drivers/net/wireless/ath/ar9170/usb.c
	drivers/net/wireless/ath/ath5k/base.c
	drivers/net/wireless/ath/ath5k/eeprom.c
	drivers/net/wireless/ath/ath5k/eeprom.h
	drivers/net/wireless/ath/ath5k/phy.c
	drivers/net/wireless/ath/ath9k/ath9k.h
	drivers/net/wireless/ath/ath9k/hw.c
	drivers/net/wireless/ath/ath9k/hw.h
	drivers/net/wireless/ath/ath9k/mac.c
	drivers/net/wireless/ath/ath9k/mac.h
	drivers/net/wireless/ath/ath9k/main.c
	drivers/net/wireless/ath/ath9k/reg.h
	drivers/net/wireless/ath/ath9k/xmit.c
	drivers/net/wireless/b43/b43.h
	drivers/net/wireless/b43/main.c
	drivers/net/wireless/b43/rfkill.c
	drivers/net/wireless/b43legacy/rfkill.c
	drivers/net/wireless/ipw2x00/ipw2100.c
	drivers/net/wireless/iwlwifi/iwl-3945.c
	drivers/net/wireless/iwlwifi/iwl-4965.c
	drivers/net/wireless/iwlwifi/iwl-5000-hw.h
	drivers/net/wireless/iwlwifi/iwl-5000.c
	drivers/net/wireless/iwlwifi/iwl-agn-rs.c
	drivers/net/wireless/iwlwifi/iwl-core.c
	drivers/net/wireless/iwlwifi/iwl-dev.h
	drivers/net/wireless/iwlwifi/iwl-eeprom.c
	drivers/net/wireless/iwlwifi/iwl-eeprom.h
	drivers/net/wireless/iwlwifi/iwl3945-base.c
	drivers/net/wireless/iwmc3200wifi/iwm.h
	drivers/net/wireless/libertas/scan.c
	drivers/net/wireless/libertas/wext.c
	drivers/net/wireless/orinoco/wext.c
	drivers/net/wireless/rt2x00/rt61pci.c
	drivers/net/wireless/rtl818x/rtl8187.h
	drivers/net/wireless/rtl818x/rtl8187_dev.c
	drivers/net/wireless/rtl818x/rtl8187_rfkill.c
	drivers/usb/serial/option.c

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

..

allocpercpu.c

percpu: use dynamic percpu allocator as the default percpu allocator

2009-06-24 15:13:35 +09:00

ashmem.c

Revert "Implement read(2) in ashmem driver"

2011-07-30 22:16:26 +08:00

backing-dev.c

Thaw refrigerated bdi flusher threads before invoking kthread_stop on them

2009-11-12 13:08:11 +01:00

bootmem.c

kmemleak: Do not report alloc_bootmem blocks as leaks

2009-08-27 14:29:17 +01:00

bounce.c

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

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

debug-pagealloc.c

generic debug pagealloc

2009-04-01 08:59:13 -07:00

dmapool.c

dmapools: protect page_list walk in show_pools()

2009-06-30 18:56:00 -07:00

fadvise.c

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

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

failslab.c

kmemtrace, mm: fix slab.h dependency problem in mm/failslab.c

2009-04-03 12:23:01 +02:00

filemap_xip.c

const: mark struct vm_struct_operations

2009-09-27 11:39:25 -07:00

filemap.c

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

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

fremap.c

Do not account for the address space used by hugetlbfs using VM_ACCOUNT

2009-02-10 10:48:42 -08:00

highmem.c

highmem: Fix debug_kmap_atomic() to also handle KM_IRQ_PTE, KM_NMI, and KM_NMI_PTE

2009-11-10 04:15:47 +01:00

hugetlb.c

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

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

hwpoison-inject.c

HWPOISON: Add simple debugfs interface to inject hwpoison on arbitary PFNs

2009-09-16 11:50:17 +02:00

init-mm.c

mm: consolidate init_mm definition

2009-06-16 19:47:28 -07:00

internal.h

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

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

Kconfig

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

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

Kconfig.debug

trivial: improve help text for mm debug config options

2009-09-21 15:14:57 +02:00

kmemcheck.c

kmemcheck: add hooks for the page allocator

2009-06-15 15:48:33 +02:00

kmemleak-test.c

percpu: clean up percpu variable definitions

2009-06-24 15:13:48 +09:00

kmemleak.c

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

2011-07-30 16:01:15 +08:00

ksm.c

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

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

maccess.c

[S390] maccess: add weak attribute to probe_kernel_write

2009-06-12 10:27:37 +02:00

madvise.c

Merge branch 'hwpoison' of git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-mce-2.6

2009-09-24 07:53:22 -07:00

Makefile

ashmem for 2.6.27.

2010-02-08 15:07:23 -08:00

memcontrol.c

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

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

memory_hotplug.c

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

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

memory-failure.c

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

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

memory.c

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

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

mempolicy.c

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

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

mempool.c

mm: remove broken 'kzalloc' mempool

2009-09-22 07:17:35 -07:00

migrate.c

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

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

mincore.c

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

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

mlock.c

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

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

mm_init.c

mm: mminit_loglevel cannot be __meminitdata anymore

2008-08-20 15:40:30 -07:00

mmap.c

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

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

mmu_context.c

mm: reduce atomic use on use_mm fast path

2009-09-22 07:17:42 -07:00

mmu_notifier.c

ksm: add mmu_notifier set_pte_at_notify()

2009-09-22 07:17:31 -07:00

mmzone.c

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

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

mprotect.c

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

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

mremap.c

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

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

msync.c

[CVE-2009-0029] System call wrappers part 13

2009-01-14 14:15:23 +01:00

nommu.c

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

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

oom_kill.c

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

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

page_alloc.c

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

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

page_cgroup.c

memory hotplug: alloc page from other node in memory online

2009-09-22 07:17:26 -07:00

page_io.c

mm: remove file argument from swap_readpage()

2009-06-16 19:47:44 -07:00

page_isolation.c

memory hotplug: fix page_zone() calculation in test_pages_isolated()

2008-11-06 15:41:19 -08:00

page-writeback.c

writeback: account IO throttling wait as iowait

2009-10-09 12:40:42 +02:00

pagewalk.c

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

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

percpu.c

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

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

prio_tree.c

spelling fixes: mm/

2007-10-20 01:27:18 +02:00

quicklist.c

cpumask: use new-style cpumask ops in mm/quicklist.

2009-09-24 09:34:52 +09:30

readahead.c

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

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

rmap.c

mm/rmap.c: fix comment

2009-10-01 16:11:12 -07:00

shmem_acl.c

shmfs: use 'check_acl' instead of 'permission'

2009-09-08 11:08:46 -07:00

shmem.c

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

2011-07-30 16:09:59 +08:00

slab.c

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

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

slob.c

slab: remove duplicate kmem_cache_init_late() declarations

2009-08-06 11:36:25 +03:00

slub.c

mm: kmem_cache_create(): make it easier to catch NULL cache names

2009-09-22 07:17:33 -07:00

sparse-vmemmap.c

memory hotplug: alloc page from other node in memory online

2009-09-22 07:17:26 -07:00

sparse.c

memory hotplug: alloc page from other node in memory online

2009-09-22 07:17:26 -07:00

swap_state.c

mm: add_to_swap_cache() does not return -EEXIST

2009-09-22 07:17:35 -07:00

swap.c

mm: replace various uses of num_physpages by totalram_pages

2009-09-22 07:17:38 -07:00

swapfile.c

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

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

thrash.c

mm: pass mm to grab_swap_token

2009-06-23 12:50:05 -07:00

truncate.c

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

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

util.c

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

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

vmalloc.c

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

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

vmscan.c

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

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

vmstat.c

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

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