diff options
| author | Linus Torvalds | 2014-02-11 21:24:35 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2014-02-11 21:24:35 +0100 |
| commit | 738b52bb9845da183b6ff46a8f685b56a63379d1 (patch) | |
| tree | 6e812400614efd2a3e03bf5412cf23eaeb166828 /include/uapi/linux/ethtool.h | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s39... (diff) | |
| parent | microblaze: Fix a typo when disabling stack protection (diff) | |
| download | kernel-qcow2-linux-738b52bb9845da183b6ff46a8f685b56a63379d1.tar.gz kernel-qcow2-linux-738b52bb9845da183b6ff46a8f685b56a63379d1.tar.xz kernel-qcow2-linux-738b52bb9845da183b6ff46a8f685b56a63379d1.zip | |
Merge tag 'microblaze-3.14-rc3' of git://git.monstr.eu/linux-2.6-microblaze
Pull microblaze fixes from Michal Simek:
- Fix two compilation issues - HZ, readq/writeq
- Fix stack protection support
* tag 'microblaze-3.14-rc3' of git://git.monstr.eu/linux-2.6-microblaze:
microblaze: Fix a typo when disabling stack protection
microblaze: Define readq and writeq IO helper function
microblaze: Fix missing HZ macro
Diffstat (limited to 'include/uapi/linux/ethtool.h')
0 files changed, 0 insertions, 0 deletions