summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-s...Russell King2011-12-0596-1406/+179
|\
| * ARM: move VMALLOC_END down temporarily for shmobileNicolas Pitre2011-11-261-0/+7
| * ARM: big removal of now unused vmalloc.h filesNicolas Pitre2011-11-2659-866/+0
| * ARM: add generic ioremap optimization by reusing static mappingsNicolas Pitre2011-11-263-25/+64
| * ARM: simplify __iounmap() when dealing with section based mappingNicolas Pitre2011-11-261-11/+9
| * ARM: move iotable mappings within the vmalloc regionNicolas Pitre2011-11-263-27/+41
| * mm: add vm_area_add_early()Nicolas Pitre2011-11-182-2/+28
| * ARM: move initialization of the high_memory variable earlierNicolas Pitre2011-11-183-2/+3
| * ARM: sort the meminfo array earlierNicolas Pitre2011-11-182-30/+16
| * ARM: realview-eb11mp: fix map_desc alignmentRob Herring2011-11-181-2/+2
| * ARM: realview: fix map_desc alignmentRob Herring2011-11-181-2/+2
| * ARM: versatile: remove overlapping map_desc entryRob Herring2011-11-181-5/+0
| * ARM: plat-iop: remove arch specific special handling for ioremapNicolas Pitre2011-11-184-75/+0
| * ARM: mach-ixp23xx: remove arch specific special handling for ioremapNicolas Pitre2011-11-181-29/+0
| * ARM: mach-kirkwood: remove arch specific special handling for ioremapNicolas Pitre2011-11-181-25/+0
| * ARM: mach-orion5x: remove arch specific special handling for ioremapNicolas Pitre2011-11-181-25/+0
| * ARM: mach-bcmring: use proper constant to identify DMA memory areaNicolas Pitre2011-11-181-1/+1
| * ARM: plat-omap: remove arch specific special handling for ioremapNicolas Pitre2011-11-186-170/+8
| * ARM: mach-tegra: remove arch specific special handling for ioremapNicolas Pitre2011-11-162-27/+0
| * ARM: mach-davinci: remove arch specific special handling for ioremapNicolas Pitre2011-11-153-57/+1
| * ARM: mach-at91: remove arch specific special handling for ioremapNicolas Pitre2011-11-152-26/+0
| * ARM: plat-mxc: remove inclusion of <mach/vmalloc.h>Nicolas Pitre2011-11-151-2/+0
| * ARM: mach-prima2: don't define SIRFSOC_VA in terms of VMALLOC_ENDNicolas Pitre2011-11-151-2/+4
| * ARM: mach-dove: remove inclusion of <mach/vmalloc.h>Nicolas Pitre2011-11-151-2/+0
* | Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/will/...Russell King2011-12-05679-5343/+7356
|\ \
| | \
| | \
| *-. \ Merge branches 'perf/event-nos', 'perf/updates' and 'perf/omap4' into for-rmkWill Deacon2011-12-024-16/+200
| |\ \ \
| | | * | arm: pmu: allow platform specific irq enable/disable handlingMing Lei2011-12-022-5/+20
| | | * | arm: introduce cross trigger interface helpersMing Lei2011-12-021-0/+179
| | * | | ARM: perf: remove unused armpmu_get_max_eventsWill Deacon2011-12-022-11/+1
| | |/ /
| * | | ARM: perf: add support for stalled cycle ABI eventsWill Deacon2011-12-023-49/+66
| * | | ARM: perf: clean and update ARMv7 event numbersWill Deacon2011-12-021-233/+125
| |/ /
| * | Linux 3.2-rc4v3.2-rc4Linus Torvalds2011-12-011-1/+1
| * | Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2011-12-0131-536/+995
| |\ \
| | * | ocfs2: avoid unaligned access to dqc_bitmapAkinobu Mita2011-12-012-5/+52
| | * | ocfs2: Use filemap_write_and_wait() instead of write_inode_now()Jan Kara2011-11-171-1/+1
| | * | ocfs2: honor O_(D)SYNC flag in fallocateMark Fasheh2011-11-171-0/+3
| | * | ocfs2: Add a missing journal credit in ocfs2_link_credits() -v2Xiaowei.Hu2011-11-171-2/+3
| | * | ocfs2: send correct UUID to cleancache initializationDan Magenheimer2011-11-171-1/+1
| | * | ocfs2: Commit transactions in error cases -v2Wengang Wang2011-11-173-6/+9
| | * | ocfs2: make direntry invalid when deleting itWengang Wang2011-11-171-2/+1
| | * | fs/ocfs2/dlm/dlmlock.c: free kmem_cache_zalloc'd data using kmem_cache_freeJulia Lawall2011-11-171-1/+1
| | * | Merge branch 'mw-3.1-jul25' of git://oss.oracle.com/git/smushran/linux-2.6 in...Joel Becker2011-08-214577-119139/+261695
| | |\ \
| | | * | ocfs2: Implement llseek()Sunil Mushran2011-07-253-2/+151
| | | * | ocfs2: Fix ocfs2_page_mkwrite()Wengang Wang2011-07-242-37/+67
| | | * | ocfs2: Add comment about orphan scanningSunil Mushran2011-07-241-0/+14
| | | * | ocfs2: Clean up messages in the fsSunil Mushran2011-07-244-14/+22
| | | * | ocfs2/cluster: Cluster up now includes network connections tooSunil Mushran2011-07-242-13/+61
| | | * | ocfs2/cluster: Add new function o2net_fill_node_map()Sunil Mushran2011-07-243-33/+90
| | | * | ocfs2/cluster: Fix output in file elapsed_time_in_msSunil Mushran2011-07-241-3/+6
| | | * | ocfs2/dlm: dlmlock_remote() needs to account for remasterySunil Mushran2011-07-241-10/+8