summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmwLinus Torvalds2012-12-1516-194/+380
|\
| * GFS2: Set gl_object during inode createBob Peterson2012-11-211-0/+1
| * GFS2: add error check while allocating new inodesBob Peterson2012-11-161-0/+4
| * GFS2: don't reference inode's glock during block allocation traceBob Peterson2012-11-161-1/+1
| * GFS2: remove redundant lvb pointerDavid Teigland2012-11-155-15/+12Star
| * GFS2: only use lvb on glocks that need itDavid Teigland2012-11-154-13/+32
| * GFS2: skip dlm_unlock calls in unmountDavid Teigland2012-11-143-0/+10
| * GFS2: Fix one RG corner caseSteven Whitehouse2012-11-131-1/+2
| * GFS2: Eliminate redundant buffer_head manipulation in gfs2_unlink_inodeBob Peterson2012-11-131-18/+4Star
| * GFS2: Use dirty_inode in gfs2_dir_addBob Peterson2012-11-131-6/+1Star
| * GFS2: Fix truncation of journaled data filesSteven Whitehouse2012-11-131-3/+49
| * GFS2: Add Orlov allocatorSteven Whitehouse2012-11-078-15/+38
| * GFS2: Use proper allocation context for new inodesSteven Whitehouse2012-11-071-79/+92
| * GFS2: Add test for resource group congestion statusSteven Whitehouse2012-11-071-4/+90
| * GFS2: Rename glops go_xmote_th to go_syncBob Peterson2012-11-073-6/+6
| * GFS2: Speed up gfs2_rbm_from_blockBob Peterson2012-11-073-9/+16
| * GFS2: Review bug traps in glops.cSteven Whitehouse2012-11-073-38/+36Star
* | Revert "x86, mm: Include the entire kernel memory map in trampoline_pgd"Linus Torvalds2012-12-153-128/+3Star
* | Merge tag 'disintegrate-x86-20121214' of git://git.infradead.org/users/dhowel...Linus Torvalds2012-12-1580-1428/+1587
|\ \
| * | UAPI: (Scripted) Disintegrate arch/x86/include/asmDavid Howells2012-12-1480-1428/+1587
* | | Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux-2.6Linus Torvalds2012-12-153-2/+14
|\ \ \
| * | | of: *node argument to of_parse_phandle_with_args should be constGuennadi Liakhovetski2012-12-112-2/+2
| * | | of/i2c: add dummy inline functions for when CONFIG_OF_I2C(_MODULE) isn't definedGuennadi Liakhovetski2012-12-111-0/+12
* | | | Merge tag 'mvebu' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-12-1476-414/+6530
|\ \ \ \
| * \ \ \ Merge tag 'mvebu_cache_l2x0_for_3.8' of git://git.infradead.org/users/jcooper...Olof Johansson2012-11-305-0/+27
| |\ \ \ \
| | * | | | arm: l2x0: add aurora related properties to OF bindingGregory CLEMENT2012-11-271-0/+9
| | * | | | arm: mvebu: add Aurora L2 Cache Controller to the DTGregory CLEMENT2012-11-272-0/+13
| | * | | | arm: mvebu: add L2 cache supportGregory CLEMENT2012-11-272-0/+5
| * | | | | Merge tag 'mvebu_everything_for_3.8' of git://git.infradead.org/users/jcooper...Olof Johansson2012-11-3075-412/+6503
| |\| | | |
| | * | | | Merge branch 'mvebu-misc-fixes' of git://github.com/MISL-EBU-System-SW/mainli...Jason Cooper2012-11-245-14/+18
| | |\ \ \ \
| | | * | | | dma: mv_xor: fix error handling pathThomas Petazzoni2012-11-221-0/+1
| | | * | | | dma: mv_xor: fix error checking of irq_of_parse_and_map()Thomas Petazzoni2012-11-221-2/+2
| | | * | | | dma: mv_xor: use request_irq() instead of devm_request_irq()Thomas Petazzoni2012-11-221-5/+6
| | | * | | | dma: mv_xor: clear the window override control registersThomas Petazzoni2012-11-222-0/+3
| | | * | | | arm: mvebu: fix address decoding armada_cfg_base() functionThomas Petazzoni2012-11-221-1/+1
| | | * | | | Merge tag 'marvell-armadaxp-smp-for-3.8' of github.com:MISL-EBU-System-SW/mai...Thomas Petazzoni2012-11-2222-12/+684
| | | |\ \ \ \
| | | * \ \ \ \ Merge branch 'for-jason-1/cleanup' into mevbu-dt-additionsThomas Petazzoni2012-11-222-6/+5Star
| | | |\ \ \ \ \
| | | | * | | | | arm: mvebu: fix typo in machine name for Armada 370/XPThomas Petazzoni2012-11-141-1/+1
| | | | * | | | | arm: mvebu: don't list all boards in dt compat field for Armada 370/XPThomas Petazzoni2012-11-141-4/+3Star
| | | | * | | | | arm: mvebu: fix compatible string in armada-370-xp.dtsiThomas Petazzoni2012-11-141-1/+1
| | * | | | | | | Merge tag 'marvell-openblocks-i2c-sata-for-3.8' of git://github.com/MISL-EBU-...Jason Cooper2012-11-224-0/+44
| | |\| | | | | |
| | | * | | | | | ARM: mvebu: update defconfig with I2C and RTC supportThomas Petazzoni2012-11-211-0/+4
| | | * | | | | | ARM: mvebu: Add SATA support for OpenBlocks AX3-4Thomas Petazzoni2012-11-211-0/+4
| | | * | | | | | ARM: mvebu: Add support for the RTC in OpenBlocks AX3-4Nobuhiro Iwamatsu2012-11-211-0/+5
| | | * | | | | | ARM: mvebu: Add support for I2C on OpenBlocks AX3-4Nobuhiro Iwamatsu2012-11-211-0/+8
| | | * | | | | | ARM: mvebu: Add support for I2C controllers in Armada 370/XPNobuhiro Iwamatsu2012-11-211-0/+22
| | | * | | | | | Merge tag 'marvell-net-xor-defconfig-for-3.8' of github.com:MISL-EBU-System-S...Thomas Petazzoni2012-11-201-0/+7
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge tag 'marvell-xor-board-dt-changes-3.8-v2' of github.com:MISL-EBU-System...Thomas Petazzoni2012-11-206-23/+158
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge tag 'marvell-xor-cleanup-dt-binding-3.8' of github.com:MISL-EBU-System-...Thomas Petazzoni2012-11-208-347/+366
| | | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge tag 'marvell-neta-dt-clk-updates-3.8' of github.com:MISL-EBU-System-SW/...Thomas Petazzoni2012-11-206-12/+4Star
| | | |\ \ \ \ \ \ \ \ \