diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-02-11 12:24:35 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-02-11 12:24:35 -0800 |
| commit | 738b52bb9845da183b6ff46a8f685b56a63379d1 (patch) | |
| tree | 6e812400614efd2a3e03bf5412cf23eaeb166828 /drivers/net/ethernet/stmicro/stmmac/Makefile | |
| parent | a87af778d847dc085c06c98b7e6d1ca441f7f087 (diff) | |
| parent | a49f56eec54d864ba0fda838e4c8bf5c72f3eb08 (diff) | |
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 'drivers/net/ethernet/stmicro/stmmac/Makefile')
0 files changed, 0 insertions, 0 deletions