summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'pending-dma-streaming' (early part) into develRussell King2009-12-046-21/+56
|\
| * ARM: dma-mapping: split dma_unmap_page() from dma_unmap_single()Russell King2009-11-232-6/+23
| * ARM: dma-mapping: provide dma_to_page()Russell King2009-11-234-0/+26
| * ARM: dma-mapping: simplify page_to_dma() and __pfn_to_bus()Russell King2009-11-232-11/+2
| * ARM: provide phys_to_page() to complement page_to_phys()Russell King2009-11-231-5/+6
* | Merge branch 'pending-dma-coherent' into develRussell King2009-12-046-326/+366
|\ \
| * | ARM: dma-mapping: switch ARMv7 DMA mappings to retain 'memory' attributeRussell King2009-11-243-11/+26
| * | ARM: dma-mapping: get rid of setting/clearing the reserved page bitRussell King2009-11-241-20/+3
| * | ARM: dma-mapping: Factor out noMMU dma buffer allocation codeRussell King2009-11-241-30/+15
| * | ARM: dma-mapping: clean up coherent arch dma allocationRussell King2009-11-241-19/+12
| * | ARM: dma-mapping: move consistent_init into CONFIG_MMU sectionRussell King2009-11-241-40/+38
| * | ARM: dma-mapping: factor dma_free_coherent() common codeRussell King2009-11-241-73/+68
| * | ARM: dma-mapping: fix nommu dma_alloc_coherent()Russell King2009-11-241-16/+9
| * | ARM: dma-mapping: fix coherent arch dma_alloc_coherent()Russell King2009-11-241-8/+10
| * | ARM: dma-mapping: functions to allocate/free a coherent bufferRussell King2009-11-241-44/+66
| * | ARM: dma-mapping: split out vmregion code from dma coherent mapping codeRussell King2009-11-244-120/+174
| |/
* | Merge branch 'pending-misc' (early part) into develRussell King2009-12-041222-12597/+22150
|\ \
| * | ARM: I-cache: flush executable mappings in flush_cache_range()Russell King2009-12-041-2/+1
| * | ARM: I-cache: avoid flushing in flush_cache_mm()Russell King2009-12-041-1/+0
| * | ARM: I-cache: Add invalidation for VIVT ASID tagged cachesRussell King2009-12-041-0/+6
| * | ARM: 5794/1: Flush the D-cache during copy_user_highpage()Catalin Marinas2009-12-041-0/+8
| * | ARM: Remove __flush_icache_all() from __flush_dcache_page()Russell King2009-12-041-3/+1
| * | ARM: Move __flush_icache_all() out of flush_pfn_alias()Russell King2009-12-041-3/+8
| * | ARM: Reduce __flush_dcache_page() visibilityRussell King2009-12-043-2/+4
| * | ARM: ZERO_PAGE: Avoid flush_dcache_page() for zero pageRussell King2009-12-013-2/+18
| * | ARM: Avoid evaluating page_address() multiple timesRussell King2009-12-011-2/+4
| * | ARM: Avoid duplicated implementation for VIVT cache flushingRussell King2009-12-012-18/+19
| * | Merge branch 'security' of git://git.kernel.org/pub/scm/linux/kernel/git/linv...Linus Torvalds2009-12-016-19/+28
| |\ \
| | * | mac80211: fix spurious delBA handlingJohannes Berg2009-11-305-14/+27
| | * | mac80211: fix two remote exploitsJohannes Berg2009-11-302-5/+1
| * | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6Linus Torvalds2009-12-015-52/+34
| |\ \ \
| | * | | [SCSI] fix crash when disconnecting usb storageAlexey Kuznetsov2009-11-261-1/+1
| | * | | [SCSI] fix async scan add/remove race resulting in an oopsJames Bottomley2009-11-263-50/+32
| | * | | [SCSI] sd: Return correct error code for DIFMartin K. Petersen2009-11-261-1/+1
| * | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6Linus Torvalds2009-12-012-36/+75
| |\ \ \ \
| | * | | | crypto: gcm - fix another complete call in complete fuctionHuang Ying2009-11-161-34/+73
| | * | | | crypto: padlock-aes - Use the correct mask when checking whether copying is r...Chuck Ebbert2009-11-031-2/+2
| * | | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vap...Linus Torvalds2009-11-3014-42/+138
| |\ \ \ \ \
| | * | | | | Blackfin: fix SMP build error in start_thread()Graf Yang2009-11-251-1/+1
| | * | | | | Blackfin: fix memset in smp_send_reschedule() and -stop()Roel Kluin2009-11-251-4/+2
| | * | | | | Blackfin: fix typo in ptrace pokingJie Zhang2009-11-251-1/+1
| | * | | | | Blackfin: check for anomaly 05000475Mike Frysinger2009-11-251-0/+5
| | * | | | | Blackfin: work around testset anomaly 05000477Mike Frysinger2009-11-251-2/+12
| | * | | | | Blackfin: update anomaly listsMike Frysinger2009-11-257-31/+109
| | * | | | | Blackfin: fix cache Kconfig typoAndré Goddard Rosa2009-11-251-1/+1
| | * | | | | Blackfin: fix suspend/resume failure with some on-chip ROMsMichael Hennerich2009-11-251-2/+7
| | | |/ / / | | |/| | |
| * | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6Linus Torvalds2009-11-302-5/+12
| |\ \ \ \ \
| | * | | | | [CIFS] Fix sparse warningSteve French2009-11-252-1/+10
| | * | | | | [CIFS] Duplicate data on appending to some Samba serversSteve French2009-11-241-2/+0
| | * | | | | [CIFS] fix oops in cifs_lookup during net bootSteve French2009-11-241-2/+2
| | | |_|_|/ | | |/| | |