1. 25 7月, 2013 7 次提交
    • Y
      ktime: fix some scripts/kernel-doc warnings · 36019265
      Yacine Belkadi 提交于
      When building the htmldocs (in verbose mode), scripts/kernel-doc reports the
      following type of warnings:
      Warning(include/linux/ktime.h:75): No description found for return value of
      'ktime_set'
      
      Fix them by using a "Return:" section to describe the return values.
      (Also apply some minor reformatting along the way.)
      Signed-off-by: NYacine Belkadi <yacine.belkadi.1@gmail.com>
      Acked-by: NRob Landley <rob@landley.net>
      Signed-off-by: NJiri Kosina <jkosina@suse.cz>
      36019265
    • M
      doc: Fix typo in doucmentations · c9f3f2d8
      Masanari Iida 提交于
      Correct typo (double words) in documentations.
      Signed-off-by: NMasanari Iida <standby24x7@gmail.com>
      Acked-by: NRandy Dunlap <rdunlap@infradead.org>
      Signed-off-by: NJiri Kosina <jkosina@suse.cz>
      c9f3f2d8
    • S
      Documentation: clk: Fix a trivial typo in audss · 30abda17
      Sachin Kamat 提交于
      Fixes a trivial typo.
      Signed-off-by: NSachin Kamat <sachin.kamat@linaro.org>
      Signed-off-by: NJiri Kosina <jkosina@suse.cz>
      30abda17
    • M
      doc: devicetree: bindings: Fix typo in bindings · 9ca18397
      Masanari Iida 提交于
      Correct spelling typo in devicetree/bindings.
      Singed-off-by: NMasanari Iida <standby24x7@gmail.com>
      Signed-off-by: NJiri Kosina <jkosina@suse.cz>
      9ca18397
    • J
      Merge branch 'master' into for-next · a3f86127
      Jiri Kosina 提交于
      Sync with Linus' master to be able to apply
      trivial patche to newer code.
      Signed-off-by: NJiri Kosina <jkosina@suse.cz>
      a3f86127
    • L
      Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · 07bc9dc1
      Linus Torvalds 提交于
      Pull powerpc fixes from Ben Herrenschmidt:
       "Here is a series of powerpc fixes.  It's a bit big, mostly because of
        the series of 11 "EEH" patches from Gavin.  The EEH (Our IBM specific
        PCI/PCIe Enhanced Error Handling) code had been rotting for a while
        and this merge window saw a significant rework & fixing of it by Gavin
        Shan.
      
        However, that wasn't complete and left some open issues.  There were
        still a few corner cases that didn't work properly, for example in
        relation to hotplug and devices without explicit error handlers.  We
        had some patches but they weren't quite good enough yet so I left them
        off the 3.11 merge window.
      
        Gavin since then fixed it all up, we ran quite a few rounds of testing
        and it seems fairly solid (at least probably more than it has ever
        been).  This should probably have made -rc1 but both Gavin and I took
        some vacation so it had to wait for -rc2.
      
        The rest is more bug fixes, mostly to new features recently added, for
        example, we missed the cpu table entry for one of the two models of P8
        (we didn't realize they had different PVR [Processor Version Register]
        values), some module CRC issues, etc..."
      
      * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (23 commits)
        powerpc/perf: BHRB filter configuration should follow the task
        powerpc/perf: Ignore separate BHRB privilege state filter request
        powerpc/powernv: Mark pnv_pci_init_ioda2_phb() as __init
        powerpc/mm: Use the correct SLB(LLP) encoding in tlbie instruction
        powerpc/mm: Fix fallthrough bug in hpte_decode
        powerpc/pseries: Fix a typo in pSeries_lpar_hpte_insert()
        powerpc/eeh: Introdce flag to protect sysfs
        powerpc/eeh: Fix unbalanced enable for IRQ
        powerpc/eeh: Don't use pci_dev during BAR restore
        powerpc/eeh: Use partial hotplug for EEH unaware drivers
        powerpc/pci: Partial tree hotplug support
        powerpc/eeh: Use safe list traversal when walking EEH devices
        powerpc/eeh: Keep PE during hotplug
        powerpc/pci/hotplug: Don't need to remove from EEH cache twice
        powerpc/pci: Override pcibios_release_device()
        powerpc/eeh: Export functions for hotplug
        powerpc/eeh: Remove reference to PCI device
        powerpc: Fix the corrupt r3 error during MCE handling.
        powerpc/perf: Set PPC_FEATURE2_EBB when we register the power8 PMU
        powerpc/pseries: Drop "select HOTPLUG"
        ...
      07bc9dc1
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · b48a97be
      Linus Torvalds 提交于
      Pull crypto fixes from Herbert Xu:
       "This push fixes a memory corruption issue in caam, as well as
        reverting the new optimised crct10dif implementation as it breaks boot
        on initrd systems.
      
        Hopefully crct10dif will be reinstated once the supporting code is
        added so that it doesn't break boot"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
        Revert "crypto: crct10dif - Wrap crc_t10dif function all to use crypto transform framework"
        crypto: caam - Fixed the memory out of bound overwrite issue
      b48a97be
  2. 24 7月, 2013 33 次提交