summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2011-01-1118-534/+845
|\
| * MAINTAINERS: Update Joel Becker's email addressJoel Becker2011-01-081-2/+3
| * ocfs2: Remove unused truncate function from alloc.cTao Ma2011-01-082-78/+0
| * ocfs2/cluster: dereferencing before checking in nst_seq_show()Dan Carpenter2011-01-081-23/+24
| * ocfs2: fix build for OCFS2_FS_STATS not enabledRandy Dunlap2011-01-081-0/+2
| * ocfs2/cluster: Show o2net timing statisticsSunil Mushran2010-12-231-54/+157
| * ocfs2/cluster: Track process message timing stats for each socketSunil Mushran2010-12-232-0/+17
| * ocfs2/cluster: Track send message timing stats for each socketSunil Mushran2010-12-232-0/+30
| * ocfs2/cluster: Use ktime instead of timeval in struct o2net_sock_containerSunil Mushran2010-12-233-62/+76
| * ocfs2/cluster: Replace timeval with ktime in struct o2net_send_trackingSunil Mushran2010-12-233-15/+19
| * ocfs2: Add DEBUG_FS dependencySunil Mushran2010-12-231-1/+1
| * ocfs2/dlm: Hard code the values for enumsSunil Mushran2010-12-231-43/+43
| * ocfs2/dlm: Minor cleanupSunil Mushran2010-12-232-27/+15
| * ocfs2/dlm: Cleanup dlmdebug.cSunil Mushran2010-12-232-117/+66
| * ocfs2: Release buffer_head in case of error in ocfs2_double_lock.Tao Ma2010-12-231-1/+4
| * ocfs2/cluster: Pin the local node when o2hb thread startsSunil Mushran2010-12-161-0/+6
| * ocfs2/cluster: Show pin state for each o2hb regionSunil Mushran2010-12-161-0/+23
| * ocfs2/cluster: Pin/unpin o2hb regionsSunil Mushran2010-12-162-42/+182
| * ocfs2/cluster: Remove dropped region from o2hb quorum region bitmapSunil Mushran2010-12-161-0/+1
| * ocfs2/cluster: Pin the remote node item in configfsSunil Mushran2010-12-161-0/+9
| * ocfs2/dlm: make existing convertion precedent over new lockWengang Wang2010-12-161-0/+3
| * ocfs2/dlm: Cleanup mlogs in dlmthread.c, dlmast.c and dlmdomain.cSunil Mushran2010-12-163-90/+120
| * ocfs2: Try to free truncate log when meeting ENOSPC in write.Tao Ma2010-12-163-1/+66
* | Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblazeLinus Torvalds2011-01-1113-240/+214
|\ \
| * | microblaze: remove obsolete DEBUG_BOOTMEMAmerigo Wang2011-01-102-5/+0
| * | Merge commit 'v2.6.37' into nextMichal Simek2011-01-101628-13553/+24995
| |\ \
| * | | microblaze: trivial: Fix removed the part of lineMichal Simek2011-01-031-1/+1
| * | | microblaze: Fix __muldi3 function for little-endian.Michal Simek2011-01-032-121/+60
| * | | microblaze: Clear i/dcache for sw breakpointsMichal Simek2011-01-031-0/+3
| * | | microblaze: Remove useless early_init_dt_check_for_initrdMichal Simek2011-01-031-3/+1
| * | | microblaze: Fix unaligned exception for little endian platformMichal Simek2011-01-031-0/+9
| * | | microblaze: Add PVR for Microblaze v8.00.bMichal Simek2011-01-031-0/+1
| * | | microblaze: Correct PVR access macrosroel kluin2011-01-031-89/+96
| * | | Revert "microblaze: Simplify syscall rutine"Michal Simek2010-11-181-7/+39
| * | | microblaze: Fix initramfsMichal Simek2010-11-181-13/+3
| * | | arch/microblaze: Remove unnecessary semicolonsJoe Perches2010-11-151-1/+1
* | | | Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds2011-01-1116-102/+297
|\ \ \ \
| * | | | x86: Fix Moorestown VRTC fixmap placementArjan van de Ven2011-01-111-2/+2
| * | | | x86/gpio: Implement x86 gpio_to_irq convert functionAlek Du2011-01-111-4/+1
| * | | | x86, UV: Fix APICID shift for Westmere processorsJack Steiner2011-01-111-1/+1
| * | | | x86: Use PCI method for enabling AMD extended config space before MSR methodJan Beulich2011-01-114-28/+63
| * | | | x86: tsc: Prevent delayed init if initial tsc calibration failedThomas Gleixner2011-01-111-1/+1
| * | | | x86, lapic-timer: Increase the max_delta to 31 bitsPierre Tardy2011-01-101-1/+1
| * | | | Merge branch 'x86/numa' into x86/urgentIngo Molnar2011-01-106-63/+225
| |\ \ \ \
| | * | | | x86, numa: Fix CONFIG_DEBUG_PER_CPU_MAPS without NUMA emulationDavid Rientjes2011-01-071-11/+37
| | * | | | Merge branch 'x86/apic-cleanups' into x86/numaH. Peter Anvin2010-12-2937-301/+2087
| | |\ \ \ \
| | * | | | | x86, numa: Fix cpu to node mapping for sparse node idsDavid Rientjes2010-12-245-29/+25
| | * | | | | x86, numa: Fake node-to-cpumask for NUMA emulationDavid Rientjes2010-12-241-20/+79
| | * | | | | x86, numa: Fake apicid and pxm mappings for NUMA emulationDavid Rientjes2010-12-245-24/+95
| | * | | | | x86, numa: Avoid compiling NUMA emulation functions without CONFIG_NUMA_EMUDavid Rientjes2010-12-244-2/+12