diff options
| author | Linus Torvalds <[email protected]> | 2014-03-25 00:36:58 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2014-03-25 00:36:58 +0000 |
| commit | 822316461b15e0207e50ff661f9cf830af116e9f (patch) | |
| tree | 96e42d5eca385746ea6791807c93933952dc1c3e /drivers/infiniband/hw/mlx4/alias_GUID.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc (diff) | |
| parent | parisc: locks: remove redundant arch_*_relax operations (diff) | |
| download | kernel-822316461b15e0207e50ff661f9cf830af116e9f.tar.gz kernel-822316461b15e0207e50ff661f9cf830af116e9f.zip | |
Merge branch 'parisc-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux
Pull parisc updates from Helge Deller:
- revert parts of the latest patch regarding font selection with STICON
console
- wire up the utimes() syscall for parisc
- remove the unused parisc tmpalias code and unnecessary arch*relax
defines
* 'parisc-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
parisc: locks: remove redundant arch_*_relax operations
parisc: wire up sys_utimes
parisc: Remove unused CONFIG_PARISC_TMPALIAS code
partly revert commit 8a10bc9: parisc/sti_console: prefer Linux fonts over built-in ROM fonts
Diffstat (limited to 'drivers/infiniband/hw/mlx4/alias_GUID.c')
0 files changed, 0 insertions, 0 deletions