summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mas...Linus Torvalds2011-12-019-25/+60
|\
| * Btrfs: fix meta data raid-repair merge problemJan Schmidt2011-12-011-7/+20
| * Btrfs: skip allocation attempt from empty clusterAlexandre Oliva2011-11-301-3/+3
| * Btrfs: skip block groups without enough space for a clusterAlexandre Oliva2011-11-301-1/+1
| * Btrfs: start search for new cluster at the beginningAlexandre Oliva2011-11-301-4/+2
| * Btrfs: reset cluster's max_size when creating bitmapAlexandre Oliva2011-11-301-0/+1
| * Btrfs: initialize new bitmaps' listAlexandre Oliva2011-11-301-0/+1
| * Btrfs: fix oops when calling statfs on readonly deviceLi Zefan2011-11-301-3/+3
| * Btrfs: Don't error on resizing FS to same sizeMike Fleetwood2011-11-301-1/+1
| * Btrfs: fix deadlock on metadata reservation when evicting a inodeMiao Xie2011-11-303-5/+22
| * Fix URL of btrfs-progs git repository in docsArnd Hannemann2011-11-301-2/+2
| * btrfs scrub: handle -ENOMEM from init_ipath()Dan Carpenter2011-11-301-0/+5
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rol...Linus Torvalds2011-12-0110-45/+62
|\ \
| | \
| | \
| | \
| | \
| *---. \ Merge branches 'cxgb4', 'ipoib', 'misc' and 'qib' into for-nextRoland Dreier2011-11-309-43/+58
| |\ \ \ \
| | | | * | IB/qib: Fix over-scheduling of QSFP workMike Marciniszyn2011-11-282-20/+8
| | | | * | IB/qib: Don't use schedule_work()Mike Marciniszyn2011-11-081-1/+1
| | | * | | IB: Fix RCU lockdep splatsEric Dumazet2011-11-296-14/+35
| | | |/ /
| | * / / IB/ipoib: Prevent hung task or softlockup processing multicast responseMike Marciniszyn2011-11-293-8/+14
| | |/ /
| * | | RDMA/cxgb4: Fix retry with MPAv1 logic for MPAv2Kumar Sanghvi2011-11-281-1/+3
| * | | RDMA/cxgb4: Fix iw_cxgb4 count_rcqes() logicJonathan Lallinger2011-11-281-1/+1
| |/ /
* | | Merge branch 'dt-for-linus' of git://sources.calxeda.com/kernel/linuxLinus Torvalds2011-12-012-0/+3
|\ \ \
| * | | of: Add Silicon Image vendor prefixPawel Moll2011-11-291-0/+1
| * | | of/irq: of_irq_init: add check for parent equal to child nodeRob Herring2011-11-291-0/+2
* | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bro...Linus Torvalds2011-12-013-4/+46
|\ \ \ \
| * | | | regulator: twl: fix twl4030 support for smps regulatorsTero Kristo2011-11-281-2/+44
| * | | | regulator: fix use after free bugLothar Waßmann2011-11-281-1/+1
| * | | | regulator: aat2870: Fix the logic of checking if no id is matched in aat2870_...Axel Lin2011-11-281-1/+1
| |/ / /
* | | | Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm...Linus Torvalds2011-12-0171-270/+517
|\ \ \ \
| * \ \ \ Merge branch 'defconfigs-for-arnd' of git://git.linaro.org/people/triad/linux...Arnd Bergmann2011-11-29453-3335/+3858
| |\ \ \ \
| | * | | | ARM: ux500: update defconfigLinus Walleij2011-11-291-9/+5
| | * | | | ARM: u300: update defconfigLinus Walleij2011-11-291-7/+6
| | |/ / /
| * | | | Merge branch 'fixes-dss' of git://git.kernel.org/pub/scm/linux/kernel/git/tml...Arnd Bergmann2011-11-2412-35/+276
| |\ \ \ \
| | * \ \ \ Merge branch 'hwmod_dss_fixes_3.2rc' of git://git.pwsan.com/linux-2.6 into fi...Tony Lindgren2011-11-2312-35/+276
| | |\ \ \ \
| | | * | | | ARM: OMAP2PLUS: DSS: Ensure DSS works correctly if display is enabled in boot...Archit Taneja2011-11-088-0/+170
| | | * | | | ARM: OMAP: HWMOD: Unify DSS resets for OMAPsTomi Valkeinen2011-11-086-11/+43
| | | * | | | ARM: OMAP2/3: HWMOD: Add SYSS_HAS_RESET_STATUS for dssTomi Valkeinen2011-11-081-1/+2
| | | * | | | ARM: OMAP4: HWMOD: fix DSS clock dataTomi Valkeinen2011-11-081-3/+3
| | | * | | | ARM: OMAP4: HWMOD: Add HWMOD_CONTROL_OPT_CLKS_IN_RESET for dss_coreTomi Valkeinen2011-11-081-0/+1
| | | * | | | ARM: OMAP4: HWMOD: remove extra clocksTomi Valkeinen2011-11-081-9/+0
| | | * | | | ARM: OMAP3: HWMOD: fix DSS clock dataTomi Valkeinen2011-11-081-2/+22
| | | * | | | ARM: OMAP3: HWMOD: Fix DSS resetTomi Valkeinen2011-11-081-3/+9
| | | * | | | ARM: OMAP2xxx: HWMOD: fix DSS clock dataTomi Valkeinen2011-11-082-4/+16
| | | * | | | ARM: OMAP2xxx: HWMOD: Fix DSS resetTomi Valkeinen2011-11-082-2/+10
| | | | |/ / | | | |/| |
| * | | | | Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/...Arnd Bergmann2011-11-2416-42/+70
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'fixes-v3.2-rc2' into fixesTony Lindgren2011-11-23666-12203/+21805
| | |\ \ \ \ \
| | | * | | | | ARM: OMAP2+: Fix Compilation error when omap_l3_noc built as moduleGovindraj.R2011-11-231-1/+1
| | | * | | | | ARM: OMAP2+: Remove empty io.hThomas Weber2011-11-231-0/+0
| | | * | | | | ARM: OMAP2: select ARM_AMBA if OMAP3_EMU is definedMing Lei2011-11-231-0/+1
| | | * | | | | ARM: OMAP: smartreflex: fix IRQ handling bugFelipe Balbi2011-11-231-1/+1
| | | * | | | | ARM: OMAP: PM: only register TWL with voltage layer when device is presentKevin Hilman2011-11-233-4/+16