Rohit Vaswani a76e99abc5 Merge branch 'Linux 3.0.21' into msm-3.0 ...

Merge Upstream's stable 3.0.21 branch into msm-3.0
This consists 814 commits and some merge conflicts.

The merge conflicts are because of some local changes to
msm-3.0 as well as some conflicts between google's tree and
the upstream tree.

Conflicts:
	arch/arm/kernel/head.S
	drivers/bluetooth/ath3k.c
	drivers/bluetooth/btusb.c
	drivers/mmc/core/core.c
	drivers/tty/serial/serial_core.c
	drivers/usb/host/ehci-hub.c
	drivers/usb/serial/qcserial.c
	fs/namespace.c
	fs/proc/base.c

Change-Id: I62e2edbe213f84915e27f8cd6e4f6ce23db22a21
Signed-off-by: Rohit Vaswani <rvaswani@codeaurora.org>

2012-03-30 00:09:34 -07:00

..

abort-ev4.S

…

abort-ev4t.S

…

abort-ev5t.S

…

abort-ev5tj.S

…

abort-ev6.S

ARM: v6k: select clear exclusive code seqences according to V6 variants

2011-02-02 21:23:28 +00:00

abort-ev7.S

arm: mm: qsd8x50: Fix incorrect permission faults

2010-05-03 11:15:05 -07:00

abort-lv4t.S

…

abort-macro.S

…

abort-nommu.S

…

alignment.c

ARM: 6401/1: plug a race in the alignment trap handler

2010-09-23 15:17:04 +01:00

cache-fa.S

Initial Contribution

2011-10-03 09:57:10 -07:00

cache-feroceon-l2.c

ARM: fix cache-feroceon-l2 after stack based kmap_atomic()

2010-12-19 12:57:16 -05:00

cache-l2x0.c

locking, ARM: Annotate low level hw locks as raw

2011-12-06 00:39:13 +05:30

cache-tauros2.c

ARM: Add Tauros2 L2 cache controller support

2009-11-27 15:43:21 -05:00

cache-v3.S

Initial Contribution

2011-10-03 09:57:10 -07:00

cache-v4.S

Initial Contribution

2011-10-03 09:57:10 -07:00

cache-v4wb.S

Initial Contribution

2011-10-03 09:57:10 -07:00

cache-v4wt.S

Initial Contribution

2011-10-03 09:57:10 -07:00

cache-v6.S

Initial Contribution

2011-10-03 09:57:10 -07:00

cache-v7.S

ARM: 7325/1: fix v7 boot with lockdep enabled

2012-02-17 23:35:53 -08:00

cache-xsc3l2.c

ARM: fix cache-xsc3l2 after stack based kmap_atomic()

2010-12-19 12:57:08 -05:00

context.c

msm: rtb: Log the context id in the rtb

2012-02-21 18:23:32 -08:00

copypage-fa.c

ARM: Gemini: fix compiler error in copypage-fa.c

2010-04-27 12:45:10 +02:00

copypage-feroceon.c

ARM: 6164/1: Add kto and kfrom to input operands list.

2010-06-08 19:42:18 +01:00

copypage-v3.c

ARM: Pass VMA to copy_user_highpage() implementations

2009-10-05 15:17:45 +01:00

copypage-v4mc.c

locking, ARM: Annotate low level hw locks as raw

2011-12-06 00:39:13 +05:30

copypage-v4wb.c

ARM: 6164/1: Add kto and kfrom to input operands list.

2010-06-08 19:42:18 +01:00

copypage-v4wt.c

ARM: 6164/1: Add kto and kfrom to input operands list.

2010-06-08 19:42:18 +01:00

copypage-v6.c

locking, ARM: Annotate low level hw locks as raw

2011-12-06 00:39:13 +05:30

copypage-xsc3.c

ARM: 6164/1: Add kto and kfrom to input operands list.

2010-06-08 19:42:18 +01:00

copypage-xscale.c

locking, ARM: Annotate low level hw locks as raw

2011-12-06 00:39:13 +05:30

dma-mapping.c

Merge remote-tracking branch 'common/android-3.0' into msm-3.0

2011-11-16 13:52:50 -08:00

emulate_domain_manager-v7.c

Initial Contribution

2011-10-03 09:57:10 -07:00

extable.c

…

fault-armv.c

ARM: pgtable: add pud-level code

2011-02-21 19:24:14 +00:00

fault.c

ARM: 7115/4: move __exception and friends to asm/exception.h

2011-12-29 13:52:38 +05:30

fault.h

…

flush.c

Merge branches 'consolidate', 'ep93xx', 'fixes', 'misc', 'mmci', 'remove' and 'spear' into for-linus

2011-05-23 19:27:40 +01:00

highmem.c

ARM: get rid of kmap_high_l1_vipt()

2010-12-19 12:56:46 -05:00

idmap.c

ARM: pgtable: add pud-level code

2011-02-21 19:24:14 +00:00

init.c

arm: Init SPARSEMEM section for removed memory

2011-12-21 15:29:21 -08:00

iomap.c

…

ioremap.c

Initial Contribution

2011-10-03 09:57:10 -07:00

Kconfig

msm: 9615: Enable L2 cache for MSM9615

2011-10-03 16:18:36 -07:00

Makefile

Initial Contribution

2011-10-03 09:57:10 -07:00

mm.h

PMEM: Pre reserve virtual address range for on demand devices.

2011-10-03 16:15:12 -07:00

mmap.c

ARM: 6877/1: the ADDR_NO_RANDOMIZE personality flag should be honored with mmap()

2011-04-14 09:15:24 +01:00

mmu.c

arm: mm: Compare phys address instead of virt

2011-12-20 15:15:49 -08:00

nommu.c

ARM: move memory layout sanity checking before meminfo initialization

2011-07-05 20:27:16 +01:00

pabort-legacy.S

ARM: 5727/1: Pass IFSR register to do_PrefetchAbort()

2009-10-02 22:34:32 +01:00

pabort-v6.S

ARM: 5727/1: Pass IFSR register to do_PrefetchAbort()

2009-10-02 22:34:32 +01:00

pabort-v7.S

ARM: 5727/1: Pass IFSR register to do_PrefetchAbort()

2009-10-02 22:34:32 +01:00

pgd.c

Merge branches 'fixes', 'pgt-next' and 'versatile' into devel

2011-03-20 09:32:12 +00:00

proc-arm6_7.S

ARM: pm: add generic CPU suspend/resume support

2011-02-22 17:11:23 +00:00

proc-arm7tdmi.S

ARM: 6948/1: Fix .size directives for __arm{7,9}tdmi_proc_info

2011-06-06 10:56:10 +01:00

proc-arm9tdmi.S

ARM: 6948/1: Fix .size directives for __arm{7,9}tdmi_proc_info

2011-06-06 10:56:10 +01:00

proc-arm720.S

Fix common misspellings

2011-03-31 11:26:23 -03:00

proc-arm740.S

ARM: pm: add generic CPU suspend/resume support

2011-02-22 17:11:23 +00:00

proc-arm920.S

Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into fixes

2011-04-13 23:32:13 +01:00

proc-arm922.S

Fix common misspellings

2011-03-31 11:26:23 -03:00

proc-arm925.S

Fix common misspellings

2011-03-31 11:26:23 -03:00

proc-arm926.S

ARM: Make consolidated PM sleep code depend on PM_SLEEP

2011-04-02 10:08:55 +01:00

proc-arm940.S

ARM: pm: add generic CPU suspend/resume support

2011-02-22 17:11:23 +00:00

proc-arm946.S

ARM: pm: add generic CPU suspend/resume support

2011-02-22 17:11:23 +00:00

proc-arm1020.S

Fix common misspellings

2011-03-31 11:26:23 -03:00

proc-arm1020e.S

Fix common misspellings

2011-03-31 11:26:23 -03:00

proc-arm1022.S

Fix common misspellings

2011-03-31 11:26:23 -03:00

proc-arm1026.S

Initial Contribution

2011-10-03 09:57:10 -07:00

proc-fa526.S

ARM: pm: add generic CPU suspend/resume support

2011-02-22 17:11:23 +00:00

proc-feroceon.S

ARM: pm: add generic CPU suspend/resume support

2011-02-22 17:11:23 +00:00

proc-macros.S

Fix common misspellings

2011-03-31 11:26:23 -03:00

proc-mohawk.S

ARM: pm: add generic CPU suspend/resume support

2011-02-22 17:11:23 +00:00

proc-sa110.S

ARM: pm: add generic CPU suspend/resume support

2011-02-22 17:11:23 +00:00

proc-sa1100.S

ARM: Make consolidated PM sleep code depend on PM_SLEEP

2011-04-02 10:08:55 +01:00

proc-syms.c

ARM: add size argument to __cpuc_flush_dcache_page

2009-12-14 14:53:22 +00:00

proc-v6.S

ARM: mm: update CONTEXTIDR register to contain PID of current process

2012-02-03 14:13:54 -08:00

proc-v7.S

Merge branch 'Linux 3.0.21' into msm-3.0

2012-03-30 00:09:34 -07:00

proc-xsc3.S

ARM: Make consolidated PM sleep code depend on PM_SLEEP

2011-04-02 10:08:55 +01:00

proc-xscale.S

ARM: Fix .size directive for xscale_dma_a0_map_area

2011-04-28 17:56:31 +08:00

tlb-fa.S

ARM: Add support for FA526 v2

2009-03-25 13:10:01 +02:00

tlb-v3.S

…

tlb-v4.S

…

tlb-v4wb.S

…

tlb-v4wbi.S

…

tlb-v6.S

arm: Use __INIT macro instead of .text.init.

2009-04-27 19:51:58 -07:00

tlb-v7.S

Initial Contribution

2011-10-03 09:57:10 -07:00

vcm_alloc.c

Initial Contribution

2011-10-03 09:57:10 -07:00

vcm_mm.c

Initial Contribution

2011-10-03 09:57:10 -07:00

vcm.c

Initial Contribution

2011-10-03 09:57:10 -07:00

vmregion.c

ARM: DMA: top-down allocation in DMA coherent region

2011-02-23 17:24:11 +00:00

vmregion.h

ARM: DMA coherent allocator: align remapped addresses

2010-07-27 10:43:48 +01:00