summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'mvebu-pinctrl-3.15' of git://git.infradead.org/linux-mvebu into pi...Linus Walleij2014-03-0318-291/+1480
|\
| * Merge tag 'tags/for-mvebu-pinctrl-3xx' into mvebu/pinctrlJason Cooper2014-03-016-0/+1093
| |\
| | * pinctrl: mvebu: add pin-muxing driver for the Marvell Armada 380/385Thomas Petazzoni2014-02-254-0/+547
| | * pinctrl: mvebu: add pin-muxing driver for the Marvell Armada 375Thomas Petazzoni2014-02-254-0/+546
| * | Merge remote-tracking branch 'shesselba/for-mvebu/pinctrl-dove' into mvebu/pi...Jason Cooper2014-03-018-113/+202
| |\ \
| | * | pinctrl: mvebu: dove: use global register regmapSebastian Hesselbarth2014-02-251-66/+58
| | * | pinctrl: mvebu: dove: use remapped pmu_mpp registersSebastian Hesselbarth2014-02-251-5/+7
| | * | pinctrl: mvebu: dove: use remapped mpp4 registerSebastian Hesselbarth2014-02-251-26/+27
| | * | pinctrl: mvebu: dove: use remapped mpp base registersSebastian Hesselbarth2014-02-251-13/+14
| | * | pinctrl: mvebu: dove: request syscon regmap for global registersSebastian Hesselbarth2014-02-252-0/+28
| | * | pinctrl: mvebu: dove: request additional resourcesSebastian Hesselbarth2014-02-251-3/+42
| | * | devicetree: bindings: update MVEBU pinctrl binding documentationSebastian Hesselbarth2014-02-255-1/+5
| | * | devicetree: bindings: add missing Marvell Dove SoC documentationSebastian Hesselbarth2014-02-251-0/+22
| | |/
| * / Merge tag 'tags/for-mvebu-pinctrl-cleanup' into mvebu/pinctrlJason Cooper2014-03-016-186/+193
|/| | | |/
| * pinctrl: mvebu: dove: reuse mpp_{set,get} in pmu callbacksSebastian Hesselbarth2014-02-251-20/+17
| * pinctrl: mvebu: dove: consolidate auto-numbered pmu mpp rangesSebastian Hesselbarth2014-02-251-16/+1
| * pinctrl: mvebu: remove MPP_REG_CTRL macroThomas Petazzoni2014-02-251-16/+3
| * pinctrl: mvebu: remove common get/set functionsSebastian Hesselbarth2014-02-251-47/+2
| * pinctrl: mvebu: move resource allocation to SoC specific driversSebastian Hesselbarth2014-02-255-16/+33
| * pinctrl: mvebu: armada-xp: provide generic mpp callbacksSebastian Hesselbarth2014-02-251-0/+12
| * pinctrl: mvebu: armada-370: provide generic mpp callbacksSebastian Hesselbarth2014-02-251-0/+12
| * pinctrl: mvebu: kirkwood: provide generic mpp callbacksSebastian Hesselbarth2014-02-251-0/+12
| * pinctrl: mvebu: dove: provide generic mpp callbacksSebastian Hesselbarth2014-02-251-14/+22
| * pinctrl: mvebu: add common mpp reg helper to mvebu pinctrl includeSebastian Hesselbarth2014-02-251-0/+28
| * pinctrl: mvebu: remove passing mvebu_mpp_ctrl to callbacksSebastian Hesselbarth2014-02-253-45/+32
| * pinctrl: mvebu: identify generic controls by nameSebastian Hesselbarth2014-02-251-14/+16
| * pinctrl: mvebu: remove obsolete per-control name buffer allocationSebastian Hesselbarth2014-02-251-9/+0
| * pinctrl: mvebu: count unnamed controls and allocate name bufferSebastian Hesselbarth2014-02-251-5/+19
|/
* Linus 3.14-rc1v3.14-rc1Linus Torvalds2014-02-031-3/+3
* Merge branch 'parisc-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/d...Linus Torvalds2014-02-0315-73/+278
|\
| * parisc: add flexible mmap memory layout supportHelge Deller2014-02-026-43/+233
| * parisc: Make EWOULDBLOCK be equal to EAGAIN on pariscGuy Martin2014-02-021-1/+1
| * parisc: convert uapi/asm/stat.h to use native types onlyHelge Deller2014-02-021-21/+19
| * parisc: wire up sched_setattr and sched_getattrHelge Deller2014-02-022-1/+5
| * parisc: fix cache-flushingHelge Deller2014-02-023-3/+16
| * parisc/sti_console: prefer Linux fonts over built-in ROM fontsHelge Deller2014-02-022-4/+4
* | hpfs: optimize quad buffer loadingMikulas Patocka2014-02-031-46/+50
* | hpfs: remember free spaceMikulas Patocka2014-02-033-10/+87
|/
* Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/g...Linus Torvalds2014-02-021-0/+2
|\
| * hwmon: Fix SENSORS_TMP102 dependencies to eliminate build errorsJean Delvare2014-02-021-0/+1
| * hwmon: Fix SENSORS_LM75 dependencies to eliminate build errorsJean Delvare2014-02-021-0/+1
* | Merge branch 'slab/next' of git://git.kernel.org/pub/scm/linux/kernel/git/pen...Linus Torvalds2014-02-023-27/+39
|\ \
| * | mm: Fix warning on make htmldocs caused by slab.cMasanari Iida2014-01-311-1/+1
| * | mm: slub: work around unneeded lockdep warningDave Hansen2014-01-311-0/+6
| * | mm: sl[uo]b: fix misleading commentsDave Hansen2014-01-311-4/+4
| * | slub: Fix possible format string bug.Tetsuo Handa2014-01-131-1/+1
| * | slub: use lockdep_assert_heldPeter Zijlstra2014-01-131-20/+20
| * | slub: Fix calculation of cpu slabsLi Zefan2013-12-291-1/+7
| * | slab.h: remove duplicate kmalloc declaration and fix kernel-doc warningsRandy Dunlap2013-12-181-56/+46
* | | Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/...Linus Torvalds2014-02-023-200/+244
|\ \ \