summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* MIPS: GIO bus support for SGI IP22/28Thomas Bogendoerfer2011-12-076-46/+534
* 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-224577-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
| | * ocfs2/dlm: Take inflight reference count for remotely mastered resources tooSunil Mushran2011-07-243-39/+32
| | * ocfs2/dlm: Cleanup dlm_wait_for_node_death() and dlm_wait_for_node_recovery()Sunil Mushran2011-07-242-26/+24
| | * ocfs2/dlm: Trace insert/remove of resource to/from hashSunil Mushran2011-07-243-11/+15
| | * ocfs2/dlm: Clean up refmap helpersSunil Mushran2011-07-243-79/+66
| | * ocfs2/dlm: Cleanup up dlm_finish_local_lockres_recovery()Sunil Mushran2011-07-241-32/+25
| | * ocfs2: Clean up messages in stack_o2cb.cSunil Mushran2011-07-241-2/+2
| | * ocfs2/dlm: Clean up messages in o2dlmSunil Mushran2011-07-245-70/+71
| | * ocfs2/cluster: Clean up messages in o2netSunil Mushran2011-07-241-66/+53
| | * ocfs2/cluster: Abort heartbeat start on hard-ro devicesSunil Mushran2011-07-241-69/+116
| * | ocfs2: Avoid livelock in ocfs2_readpage()Jan Kara2011-07-281-0/+8
| * | ocfs2: serialize unaligned aioMark Fasheh2011-07-285-2/+73
| * | ocfs2: use proper little-endian bitopsAkinobu Mita2011-06-011-2/+2
| * | ocfs2: null deref on allocation errorDan Carpenter2011-06-011-4/+4
| * | ocfs2: checking the wrong variable in ocfs2_move_extent()Dan Carpenter2011-06-011-1/+1
| * | ocfs2: Bugfix for hard readonly mountTiger Yang2011-06-012-7/+17
* | | Merge branch 'fixes' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-...Linus Torvalds2011-12-0127-120/+199
|\ \ \
| * | | ARM: 7182/1: ARM cpu topology: fix warningVincent Guittot2011-12-012-2/+2
| * | | ARM: 7181/1: Restrict kprobes probing SWP instructions to ARMv5 and belowJon Medhurst (Tixy)2011-12-012-10/+19
| * | | ARM: 7180/1: Change kprobes testcase with unpredictable STRD instructionJon Medhurst (Tixy)2011-12-011-1/+1
| * | | ARM: 7177/1: GIC: avoid skipping non-existent PPIs in irq_start calculationWill Deacon2011-11-261-5/+8
| * | | ARM: 7176/1: cpu_pm: register GIC PM notifier only onceMarc Zyngier2011-11-261-1/+2
| * | | ARM: 7175/1: add subname parameter to mfp_set_groupg callersAxel Lin2011-11-263-3/+4
| * | | ARM: 7174/1: Fix build error in kprobes test code on Thumb2 kernelsJon Medhurst2011-11-262-38/+78
| * | | ARM: 7172/1: dma: Drop GFP_COMP for DMA memory allocationsSumit Bhattacharya2011-11-261-0/+9
| * | | ARM: 7171/1: unwind: add unwind directives to bitops assembly macrosWill Deacon2011-11-267-22/+28
| * | | ARM: 7170/2: fix compilation breakage in entry-armv.SGuennadi Liakhovetski2011-11-261-1/+1
| * | | ARM: 7168/1: use cache type functions for arch_get_unmapped_areaRob Herring2011-11-261-17/+6
| * | | Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/will/...Russell King2011-11-223-11/+11
| |\ \ \
| | * | | ARM: perf: check that we have a platform device when reserving PMUWill Deacon2011-11-221-0/+3
| | * | | ARM: perf: initialise used_mask for fake PMU during validationWill Deacon2011-11-171-1/+7