summaryrefslogtreecommitdiffstats
path: root/drivers
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'powerpc-4.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mp...Linus Torvalds2015-04-1637-276/+346
|\
| * Merge branch 'next-sriov' of git://git.kernel.org/pub/scm/linux/kernel/git/be...Michael Ellerman2015-04-143-57/+195
| |\
| | * PCI: Consider additional PF's IOV BAR alignment in sizing and assigningWei Yang2015-03-311-16/+79
| | * PCI: Add pcibios_iov_resource_alignment() interfaceWei Yang2015-03-311-1/+7
| | * PCI: Add pcibios_sriov_enable() and pcibios_sriov_disable()Wei Yang2015-03-311-0/+19
| | * PCI: Export pci_iov_virtfn_bus() and pci_iov_virtfn_devfn()Wei Yang2015-03-311-12/+16
| | * PCI: Calculate maximum number of buses required for VFsWei Yang2015-03-312-4/+28
| | * PCI: Refresh First VF Offset and VF Stride when updating NumVFsWei Yang2015-03-311-4/+19
| | * PCI: Index IOV resources in the conventional styleBjorn Helgaas2015-03-311-4/+4
| | * PCI: Keep individual VF BAR size in struct pci_sriovWei Yang2015-03-312-19/+21
| | * PCI: Print PF SR-IOV resource that contains all VF(n) BAR spaceWei Yang2015-03-311-0/+2
| | * PCI: Print more info in sriov_enable() error messageBjorn Helgaas2015-03-311-2/+5
| * | Merge branch 'next-remove-ldst' of git://git.kernel.org/pub/scm/linux/kernel/...Michael Ellerman2015-04-0713-106/+83
| |\ \
| | * | powerpc: Remove arch specific byteswappers from the MXC MMC driverDavid Gibson2015-03-241-1/+1
| | * | media/bt8xx: Remove old powerpc cruftBenjamin Herrenschmidt2015-03-242-23/+0
| | * | powerpc: Move Power Macintosh drivers to generic byteswappersDavid Gibson2015-03-2310-82/+82
| * | | Merge branch 'next-eeh' of git://git.kernel.org/pub/scm/linux/kernel/git/benh...Michael Ellerman2015-04-073-6/+3
| |\ \ \ | | | |/ | | |/|
| | * | powerpc/eeh: Do probe on pci_dnGavin Shan2015-03-241-1/+1
| | * | net/ethernet/sfc: Don't use of_node_to_eeh_dev()Benjamin Herrenschmidt2015-03-242-5/+2
| | |/
| * | Merge branch 'next-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/ben...Michael Ellerman2015-03-263-23/+17
| |\ \
| | * | powerpc/pmac: replace current->state by set_current_state()Fabian Frederick2015-03-251-2/+2
| | * | drivers/macintosh: Delete an unnecessary check before the function call "of_n...Markus Elfring2015-03-251-2/+1
| | * | powerpc/via-pmu: fix OF node leak in Keylargo initPhil Carmody2015-03-171-0/+1
| | * | powerpc/via-pmu: fix error path in find_via_pmu()Phil Carmody2015-03-171-9/+11
| | * | powerpc: Remove duplicate cacheable_memcpy/memzero functionsKyle Moffett2015-03-171-10/+2
| | |/
| * | ps3: Fix trivial typos in comment and debug messageYannick Guerrini2015-03-261-2/+2
| * | fbdev: kconfig: replace PPC_OF with PPCKevin Hao2015-03-171-1/+1
| * | fbdev: remove the unnecessary includes of ppc specific header filesKevin Hao2015-03-171-4/+0
| * | fbdev: riva: remove the dependency on PPC_OFKevin Hao2015-03-171-10/+7
| * | fbdev: nvidia: remove the dependency on PPC_OFKevin Hao2015-03-174-17/+1
| * | fbdev: imsttfb: remove the dependency on PPC_OFKevin Hao2015-03-171-5/+1
| * | fbdev: radeon: replace PPC_OF with PPCKevin Hao2015-03-175-33/+33
| * | fbdev: aty128fb: replace PPC_OF with PPCKevin Hao2015-03-171-2/+2
| * | sata_svw: remove the dependency on PPC_OFKevin Hao2015-03-171-10/+1
* | | Merge branch 'akpm' (patches from Andrew)Linus Torvalds2015-04-1514-124/+195
|\ \ \
| * | | parisc: remove use of seq_printf return valueJoe Perches2015-04-152-72/+68
| * | | s390: remove use of seq_printf return valueJoe Perches2015-04-151-5/+7
| * | | rtc: remove use of seq_printf return valueJoe Perches2015-04-154-28/+34
| * | | power: wakeup: remove use of seq_printf return valueJoe Perches2015-04-151-9/+7
| * | | drivers/sbus/char/envctrl.c: ignore orderly_poweroff return valueJoel Stanley2015-04-152-8/+2
| * | | kernel: conditionally support non-root users, groups and capabilitiesIulia Manda2015-04-151-0/+1
| * | | paride: fix the "verbose" module paramDan Carpenter2015-04-151-2/+2
| * | | zram: fix error return codeJulia Lawall2015-04-151-0/+1
| * | | zram: deprecate zram attrs sysfs nodesSergey Senozhatsky2015-04-151-0/+15
| * | | zram: export new 'mm_stat' sysfs attrsSergey Senozhatsky2015-04-151-0/+31
| * | | zram: export new 'io_stat' sysfs attrsSergey Senozhatsky2015-04-151-0/+20
| * | | zram: use generic start/end io accountingSergey Senozhatsky2015-04-151-0/+6
| * | | zram: move compact_store() to sysfs functions areaSergey Senozhatsky2015-04-151-23/+0
| * | | zram: remove `num_migrated' device attrSergey Senozhatsky2015-04-151-2/+0
| * | | zram: support compactionMinchan Kim2015-04-152-0/+26