黄涛 7cd3739f32 Merge remote-tracking branch 'linux-2.6.32.y/master' into develop ...

Merge Linux 2.6.32.41
Conflicts:
	Makefile
	drivers/mmc/core/core.c
	drivers/net/wireless/ath/ath9k/ath9k.h
	drivers/net/wireless/ath/ath9k/hw.c
	drivers/net/wireless/ath/ath9k/main.c
	drivers/net/wireless/ath/regd_common.h
	drivers/net/wireless/b43/dma.c
	drivers/net/wireless/b43/dma.h
	drivers/net/wireless/b43/sdio.c
	drivers/net/wireless/hostap/hostap_cs.c
	drivers/net/wireless/iwlwifi/iwl-5000.c
	drivers/net/wireless/iwlwifi/iwl-agn.c
	drivers/net/wireless/iwlwifi/iwl-helpers.h
	drivers/net/wireless/iwlwifi/iwl-tx.c
	drivers/net/wireless/libertas/cmd.c
	drivers/net/wireless/p54/p54pci.c
	drivers/net/wireless/p54/p54usb.c
	drivers/net/wireless/p54/txrx.c
	drivers/net/wireless/rt2x00/rt2400pci.c
	drivers/net/wireless/rt2x00/rt2500pci.c
	drivers/net/wireless/rt2x00/rt2500usb.c
	drivers/net/wireless/rt2x00/rt2800usb.c
	drivers/net/wireless/rt2x00/rt2x00.h
	drivers/net/wireless/rt2x00/rt2x00dev.c
	drivers/net/wireless/rt2x00/rt2x00queue.c
	drivers/net/wireless/rt2x00/rt61pci.c
	drivers/net/wireless/rt2x00/rt73usb.c
	drivers/usb/serial/option.c
	mm/shmem.c

2011-06-16 11:56:59 +08:00

..

allocpercpu.c

percpu: use dynamic percpu allocator as the default percpu allocator

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

ashmem.c

ashmem: Fix ASHMEM_SET_PROT_MASK.

2010-07-15 16:31:16 -07: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

bounce: call flush_dcache_page() after bounce_copy_vec()

2010-09-20 13:17:54 -07: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

readahead: introduce FMODE_RANDOM for POSIX_FADV_RANDOM

2010-03-15 08:49:37 -07: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

mm/vfs: revalidate page->mapping in do_generic_file_read()

2010-12-09 13:26:52 -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

mm: hugetlb: fix clear_huge_page()

2010-07-05 11:10:42 -07: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

mm: fix is_mem_section_removable() page_order BUG_ON check

2010-12-09 13:26:40 -08:00

Kconfig

NOMMU: Optimise away the {dac_,}mmap_min_addr tests

2010-01-06 15:04:30 -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

kmemleak: Check for NULL pointer returned by create_object()

2009-10-09 13:28:47 -07:00

ksm.c

ksm: fix mlockfreed to munlocked

2010-01-06 15:05:22 -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

memcg: fix prepare migration

2010-05-12 14:57:00 -07:00

memory_hotplug.c

mm: fix return value of scan_lru_pages in memory unplug

2010-12-09 13:26:40 -08:00

memory-failure.c

HWPOISON: abort on failed unmap

2010-08-13 13:20:17 -07:00

memory.c

guard page for stacks that grow upwards

2010-09-26 17:21:34 -07:00

mempolicy.c

numa: fix slab_node(MPOL_BIND)

2010-12-09 13:26:39 -08:00

mempool.c

mm: remove broken 'kzalloc' mempool

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

migrate.c

Fix potential crash with sys_move_pages

2010-02-23 07:37:42 -08:00

mincore.c

mm: hugetlb: fix hugepage memory leak in mincore()

2009-12-18 14:04:29 -08:00

mlock.c

mm: Move vma_stack_continue into mm.h

2010-10-28 21:44:18 -07:00

mm_init.c

mm: mminit_loglevel cannot be __meminitdata anymore

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

mmap.c

install_special_mapping skips security_file_mmap check.

2011-01-07 14:43:14 -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

mm: page allocator: calculate a better estimate of NR_FREE_PAGES when memory is low and kswapd is awake

2010-09-26 17:21:34 -07:00

mprotect.c

perf_events: Fix perf_counter_mmap() hook in mprotect()

2010-12-09 13:27:03 -08:00

mremap.c

mm: avoid wrapping vm_pgoff in mremap()

2011-04-14 16:53:30 -07:00

msync.c

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

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

nommu.c

nommu: yield CPU while disposing VM

2010-12-09 13:27:02 -08:00

oom_kill.c

memcg: fix oom killing a child process in an other cgroup

2010-03-15 08:49:33 -07:00

page_alloc.c

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

2010-12-16 20:54:24 +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

mm: hugetlb: fix hugepage memory leak in walk_page_range()

2009-12-18 14:04:30 -08:00

percpu.c

percpu: fix pcpu_last_unit_cpu

2010-09-26 17:21:27 -07: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

readahead: fix NULL filp dereference

2010-04-26 07:41:19 -07: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

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

2011-06-16 11:56:59 +08:00

slab.c

slab: fix object alignment

2010-08-26 16:41:46 -07: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

mm: fix corruption of hibernation caused by reusing swap during image saving

2010-08-13 13:20:26 -07:00

thrash.c

mm: pass mm to grab_swap_token

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

truncate.c

vfs: Fix vmtruncate() regression

2010-01-22 15:18:41 -08:00

util.c

untangle the do_mremap() mess

2010-01-18 10:19:11 -08:00

vmalloc.c

mm, x86: Saving vmcore with non-lazy freeing of vmas

2010-11-22 10:47:31 -08:00

vmscan.c

vmscan: raise the bar to PAGEOUT_IO_SYNC stalls

2010-08-26 16:41:53 -07:00

vmstat.c

mm: page allocator: calculate a better estimate of NR_FREE_PAGES when memory is low and kswapd is awake

2010-09-26 17:21:34 -07:00